Imported Upstream version 1.34.0
[platform/upstream/grpc.git] / build_autogenerated.yaml
index 65467e9..e8c0240 100644 (file)
@@ -49,6 +49,7 @@ libs:
   - test/core/end2end/tests/cancel_in_a_vacuum.cc
   - test/core/end2end/tests/cancel_with_status.cc
   - test/core/end2end/tests/channelz.cc
+  - test/core/end2end/tests/client_streaming.cc
   - test/core/end2end/tests/compressed_payload.cc
   - test/core/end2end/tests/connectivity.cc
   - test/core/end2end/tests/default_host.cc
@@ -99,6 +100,7 @@ libs:
   - test/core/end2end/tests/retry_throttled.cc
   - test/core/end2end/tests/retry_too_many_attempts.cc
   - test/core/end2end/tests/server_finishes_request.cc
+  - test/core/end2end/tests/server_streaming.cc
   - test/core/end2end/tests/shutdown_finishes_calls.cc
   - test/core/end2end/tests/shutdown_finishes_tags.cc
   - test/core/end2end/tests/simple_cacheable_request.cc
@@ -157,6 +159,7 @@ libs:
   - test/core/end2end/tests/cancel_in_a_vacuum.cc
   - test/core/end2end/tests/cancel_with_status.cc
   - test/core/end2end/tests/channelz.cc
+  - test/core/end2end/tests/client_streaming.cc
   - test/core/end2end/tests/compressed_payload.cc
   - test/core/end2end/tests/connectivity.cc
   - test/core/end2end/tests/default_host.cc
@@ -207,6 +210,7 @@ libs:
   - test/core/end2end/tests/retry_throttled.cc
   - test/core/end2end/tests/retry_too_many_attempts.cc
   - test/core/end2end/tests/server_finishes_request.cc
+  - test/core/end2end/tests/server_streaming.cc
   - test/core/end2end/tests/shutdown_finishes_calls.cc
   - test/core/end2end/tests/shutdown_finishes_tags.cc
   - test/core/end2end/tests/simple_cacheable_request.cc
@@ -286,10 +290,12 @@ libs:
   - src/core/lib/gpr/tls_gcc.h
   - src/core/lib/gpr/tls_msvc.h
   - src/core/lib/gpr/tls_pthread.h
+  - src/core/lib/gpr/tls_stdcpp.h
   - src/core/lib/gpr/tmpfile.h
   - src/core/lib/gpr/useful.h
   - src/core/lib/gprpp/arena.h
   - src/core/lib/gprpp/atomic.h
+  - src/core/lib/gprpp/examine_stack.h
   - src/core/lib/gprpp/fork.h
   - src/core/lib/gprpp/global_config.h
   - src/core/lib/gprpp/global_config_custom.h
@@ -300,7 +306,7 @@ libs:
   - src/core/lib/gprpp/map.h
   - src/core/lib/gprpp/memory.h
   - src/core/lib/gprpp/mpscq.h
-  - src/core/lib/gprpp/string_view.h
+  - src/core/lib/gprpp/stat.h
   - src/core/lib/gprpp/sync.h
   - src/core/lib/gprpp/thd.h
   - src/core/lib/profiling/timers.h
@@ -338,19 +344,26 @@ libs:
   - src/core/lib/gpr/tmpfile_windows.cc
   - src/core/lib/gpr/wrap_memcpy.cc
   - src/core/lib/gprpp/arena.cc
+  - src/core/lib/gprpp/examine_stack.cc
   - src/core/lib/gprpp/fork.cc
   - src/core/lib/gprpp/global_config_env.cc
   - src/core/lib/gprpp/host_port.cc
   - src/core/lib/gprpp/mpscq.cc
+  - src/core/lib/gprpp/stat_posix.cc
+  - src/core/lib/gprpp/stat_windows.cc
   - src/core/lib/gprpp/thd_posix.cc
   - src/core/lib/gprpp/thd_windows.cc
   - src/core/lib/profiling/basic_timers.cc
   - src/core/lib/profiling/stap_timers.cc
   deps:
+  - absl/types:optional
   - absl/time:time
+  - absl/synchronization:synchronization
   - absl/strings:strings
   - absl/strings:str_format
+  - absl/status:status
   - absl/memory:memory
+  - absl/base:base
   secure: false
 - name: grpc
   build: all
@@ -376,6 +389,7 @@ libs:
   - src/core/ext/filters/client_channel/client_channel.h
   - src/core/ext/filters/client_channel/client_channel_channelz.h
   - src/core/ext/filters/client_channel/client_channel_factory.h
+  - src/core/ext/filters/client_channel/config_selector.h
   - src/core/ext/filters/client_channel/connector.h
   - src/core/ext/filters/client_channel/global_subchannel_pool.h
   - src/core/ext/filters/client_channel/health/health_check_client.h
@@ -395,7 +409,6 @@ libs:
   - src/core/ext/filters/client_channel/lb_policy_factory.h
   - src/core/ext/filters/client_channel/lb_policy_registry.h
   - src/core/ext/filters/client_channel/local_subchannel_pool.h
-  - src/core/ext/filters/client_channel/parse_address.h
   - src/core/ext/filters/client_channel/proxy_mapper.h
   - src/core/ext/filters/client_channel/proxy_mapper_registry.h
   - src/core/ext/filters/client_channel/resolver.h
@@ -403,6 +416,7 @@ libs:
   - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
   - src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h
   - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h
+  - src/core/ext/filters/client_channel/resolver/xds/xds_resolver.h
   - src/core/ext/filters/client_channel/resolver_factory.h
   - src/core/ext/filters/client_channel/resolver_registry.h
   - src/core/ext/filters/client_channel/resolver_result_parsing.h
@@ -410,15 +424,11 @@ libs:
   - src/core/ext/filters/client_channel/retry_throttle.h
   - src/core/ext/filters/client_channel/server_address.h
   - src/core/ext/filters/client_channel/service_config.h
+  - src/core/ext/filters/client_channel/service_config_call_data.h
+  - src/core/ext/filters/client_channel/service_config_parser.h
   - src/core/ext/filters/client_channel/subchannel.h
   - src/core/ext/filters/client_channel/subchannel_interface.h
   - src/core/ext/filters/client_channel/subchannel_pool_interface.h
-  - src/core/ext/filters/client_channel/xds/xds_api.h
-  - src/core/ext/filters/client_channel/xds/xds_bootstrap.h
-  - src/core/ext/filters/client_channel/xds/xds_channel.h
-  - src/core/ext/filters/client_channel/xds/xds_channel_args.h
-  - src/core/ext/filters/client_channel/xds/xds_client.h
-  - src/core/ext/filters/client_channel/xds/xds_client_stats.h
   - src/core/ext/filters/deadline/deadline_filter.h
   - src/core/ext/filters/http/client/http_client_filter.h
   - src/core/ext/filters/http/client_authority_filter.h
@@ -457,54 +467,66 @@ libs:
   - src/core/ext/transport/inproc/inproc_transport.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/api/v2/auth/cert.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cds.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cluster.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/address.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/base.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/discovery.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/eds.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/lds.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/listener.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/rds.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/route.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/route/route.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/srds.upb.h
-  - src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.h
-  - src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.h
-  - src/core/ext/upb-generated/envoy/config/listener/v2/api_listener.upb.h
-  - src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.h
-  - src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.h
-  - src/core/ext/upb-generated/envoy/type/http.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/regex.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/string.upb.h
-  - src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.h
-  - src/core/ext/upb-generated/envoy/type/percent.upb.h
-  - src/core/ext/upb-generated/envoy/type/range.upb.h
-  - src/core/ext/upb-generated/envoy/type/semantic_version.upb.h
-  - src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.h
-  - src/core/ext/upb-generated/gogoproto/gogo.upb.h
+  - src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.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/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_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/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/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/udp_listener_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/config/trace/v3/http_tracer.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/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/service/cluster/v3/cds.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/endpoint/v3/eds.upb.h
+  - src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.h
+  - src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h
+  - src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h
+  - src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h
+  - src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.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/string.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/http.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/semantic_version.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/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
@@ -517,9 +539,107 @@ libs:
   - 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/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/udpa/core/v1/authority.upb.h
+  - src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h
+  - src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h
+  - src/core/ext/upb-generated/udpa/core/v1/resource.upb.h
+  - src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h
+  - src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h
   - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h
   - src/core/ext/upb-generated/validate/validate.upb.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/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/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_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/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/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/udp_listener_config.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/trace/v3/http_tracer.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/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/service/cluster/v3/cds.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/endpoint/v3/eds.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.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/string.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/http.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/semantic_version.upbdefs.h
+  - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h
+  - src/core/ext/upbdefs-generated/google/api/http.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/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/udpa/core/v1/authority.upbdefs.h
+  - src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h
+  - src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h
+  - src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h
+  - src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h
+  - src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h
+  - src/core/ext/upbdefs-generated/validate/validate.upbdefs.h
+  - src/core/ext/xds/certificate_provider_factory.h
+  - src/core/ext/xds/certificate_provider_registry.h
+  - src/core/ext/xds/certificate_provider_store.h
+  - src/core/ext/xds/file_watcher_certificate_provider_factory.h
+  - src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h
+  - src/core/ext/xds/xds_api.h
+  - src/core/ext/xds/xds_bootstrap.h
+  - src/core/ext/xds/xds_certificate_provider.h
+  - src/core/ext/xds/xds_channel_args.h
+  - src/core/ext/xds/xds_client.h
+  - src/core/ext/xds/xds_client_stats.h
   - src/core/lib/avl/avl.h
   - src/core/lib/backoff/backoff.h
   - src/core/lib/channel/channel_args.h
@@ -546,8 +666,7 @@ libs:
   - src/core/lib/debug/trace.h
   - src/core/lib/gprpp/atomic.h
   - src/core/lib/gprpp/debug_location.h
-  - src/core/lib/gprpp/inlined_vector.h
-  - src/core/lib/gprpp/optional.h
+  - src/core/lib/gprpp/dual_ref_counted.h
   - src/core/lib/gprpp/orphanable.h
   - src/core/lib/gprpp/ref_counted.h
   - src/core/lib/gprpp/ref_counted_ptr.h
@@ -588,6 +707,7 @@ libs:
   - src/core/lib/iomgr/load_file.h
   - src/core/lib/iomgr/lockfree_event.h
   - src/core/lib/iomgr/nameser.h
+  - src/core/lib/iomgr/parse_address.h
   - src/core/lib/iomgr/poller/eventmanager_libuv.h
   - src/core/lib/iomgr/polling_entity.h
   - src/core/lib/iomgr/pollset.h
@@ -632,12 +752,25 @@ libs:
   - src/core/lib/iomgr/wakeup_fd_posix.h
   - src/core/lib/iomgr/work_serializer.h
   - src/core/lib/json/json.h
+  - src/core/lib/json/json_util.h
+  - src/core/lib/security/authorization/authorization_engine.h
+  - src/core/lib/security/authorization/evaluate_args.h
+  - src/core/lib/security/authorization/mock_cel/activation.h
+  - src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h
+  - src/core/lib/security/authorization/mock_cel/cel_expression.h
+  - src/core/lib/security/authorization/mock_cel/cel_value.h
+  - src/core/lib/security/authorization/mock_cel/evaluator_core.h
+  - src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
   - src/core/lib/security/context/security_context.h
   - src/core/lib/security/credentials/alts/alts_credentials.h
   - src/core/lib/security/credentials/alts/check_gcp_environment.h
   - src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h
   - src/core/lib/security/credentials/composite/composite_credentials.h
   - src/core/lib/security/credentials/credentials.h
+  - src/core/lib/security/credentials/external/aws_request_signer.h
+  - src/core/lib/security/credentials/external/external_account_credentials.h
+  - src/core/lib/security/credentials/external/file_external_account_credentials.h
+  - src/core/lib/security/credentials/external/url_external_account_credentials.h
   - src/core/lib/security/credentials/fake/fake_credentials.h
   - src/core/lib/security/credentials/google_default/google_default_credentials.h
   - src/core/lib/security/credentials/iam/iam_credentials.h
@@ -648,10 +781,14 @@ libs:
   - src/core/lib/security/credentials/oauth2/oauth2_credentials.h
   - src/core/lib/security/credentials/plugin/plugin_credentials.h
   - src/core/lib/security/credentials/ssl/ssl_credentials.h
+  - src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h
+  - src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h
   - src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h
   - src/core/lib/security/credentials/tls/tls_credentials.h
+  - src/core/lib/security/credentials/xds/xds_credentials.h
   - src/core/lib/security/security_connector/alts/alts_security_connector.h
   - src/core/lib/security/security_connector/fake/fake_security_connector.h
+  - src/core/lib/security/security_connector/insecure/insecure_security_connector.h
   - src/core/lib/security/security_connector/load_system_roots.h
   - src/core/lib/security/security_connector/load_system_roots_linux.h
   - src/core/lib/security/security_connector/local/local_security_connector.h
@@ -663,16 +800,13 @@ libs:
   - src/core/lib/security/transport/auth_filters.h
   - src/core/lib/security/transport/secure_endpoint.h
   - src/core/lib/security/transport/security_handshaker.h
-  - src/core/lib/security/transport/target_authority_table.h
   - src/core/lib/security/transport/tsi_error.h
   - src/core/lib/security/util/json_util.h
   - src/core/lib/slice/b64.h
   - src/core/lib/slice/percent_encoding.h
-  - src/core/lib/slice/slice_hash_table.h
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_string_helpers.h
   - src/core/lib/slice/slice_utils.h
-  - src/core/lib/slice/slice_weak_hash_table.h
   - src/core/lib/surface/api_trace.h
   - src/core/lib/surface/call.h
   - src/core/lib/surface/call_test_only.h
@@ -686,6 +820,7 @@ libs:
   - src/core/lib/surface/lame_client.h
   - src/core/lib/surface/server.h
   - src/core/lib/surface/validate_metadata.h
+  - src/core/lib/transport/authority_override.h
   - src/core/lib/transport/bdp_estimator.h
   - src/core/lib/transport/byte_stream.h
   - src/core/lib/transport/connectivity_state.h
@@ -737,6 +872,7 @@ libs:
   - src/core/ext/filters/client_channel/client_channel_channelz.cc
   - src/core/ext/filters/client_channel/client_channel_factory.cc
   - src/core/ext/filters/client_channel/client_channel_plugin.cc
+  - src/core/ext/filters/client_channel/config_selector.cc
   - src/core/ext/filters/client_channel/global_subchannel_pool.cc
   - src/core/ext/filters/client_channel/health/health_check_client.cc
   - src/core/ext/filters/client_channel/http_connect_handshaker.cc
@@ -756,11 +892,10 @@ libs:
   - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
   - src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
   - src/core/ext/filters/client_channel/lb_policy/xds/eds.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc
   - src/core/ext/filters/client_channel/lb_policy_registry.cc
   - src/core/ext/filters/client_channel/local_subchannel_pool.cc
-  - src/core/ext/filters/client_channel/parse_address.cc
   - src/core/ext/filters/client_channel/proxy_mapper_registry.cc
   - src/core/ext/filters/client_channel/resolver.cc
   - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -784,13 +919,10 @@ libs:
   - src/core/ext/filters/client_channel/retry_throttle.cc
   - src/core/ext/filters/client_channel/server_address.cc
   - src/core/ext/filters/client_channel/service_config.cc
+  - src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
+  - src/core/ext/filters/client_channel/service_config_parser.cc
   - src/core/ext/filters/client_channel/subchannel.cc
   - src/core/ext/filters/client_channel/subchannel_pool_interface.cc
-  - src/core/ext/filters/client_channel/xds/xds_api.cc
-  - src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
-  - src/core/ext/filters/client_channel/xds/xds_channel_secure.cc
-  - src/core/ext/filters/client_channel/xds/xds_client.cc
-  - src/core/ext/filters/client_channel/xds/xds_client_stats.cc
   - src/core/ext/filters/client_idle/client_idle_filter.cc
   - src/core/ext/filters/deadline/deadline_filter.cc
   - src/core/ext/filters/http/client/http_client_filter.cc
@@ -840,54 +972,66 @@ libs:
   - src/core/ext/transport/inproc/inproc_transport.cc
   - 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/api/v2/auth/cert.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cds.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cluster.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/eds.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/lds.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/listener.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/rds.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/route.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/route/route.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/srds.upb.c
-  - src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.c
-  - src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.c
-  - src/core/ext/upb-generated/envoy/config/listener/v2/api_listener.upb.c
-  - src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c
-  - src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c
-  - src/core/ext/upb-generated/envoy/type/http.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/regex.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/string.upb.c
-  - src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.c
-  - src/core/ext/upb-generated/envoy/type/percent.upb.c
-  - src/core/ext/upb-generated/envoy/type/range.upb.c
-  - src/core/ext/upb-generated/envoy/type/semantic_version.upb.c
-  - src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.c
-  - src/core/ext/upb-generated/gogoproto/gogo.upb.c
+  - src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.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/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_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/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/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/udp_listener_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/config/trace/v3/http_tracer.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/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/service/cluster/v3/cds.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/endpoint/v3/eds.upb.c
+  - src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c
+  - src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c
+  - src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c
+  - src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c
+  - src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.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/string.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/http.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/semantic_version.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/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
@@ -900,9 +1044,105 @@ libs:
   - 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/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/udpa/core/v1/authority.upb.c
+  - src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c
+  - src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c
+  - src/core/ext/upb-generated/udpa/core/v1/resource.upb.c
+  - src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c
+  - src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c
   - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
   - src/core/ext/upb-generated/validate/validate.upb.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/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/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_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/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/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/udp_listener_config.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/trace/v3/http_tracer.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/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/service/cluster/v3/cds.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/endpoint/v3/eds.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c
+  - src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.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/string.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/http.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/semantic_version.upbdefs.c
+  - src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c
+  - src/core/ext/upbdefs-generated/google/api/http.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/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/udpa/core/v1/authority.upbdefs.c
+  - src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c
+  - src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c
+  - src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c
+  - src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c
+  - src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c
+  - src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
+  - src/core/ext/xds/certificate_provider_registry.cc
+  - src/core/ext/xds/certificate_provider_store.cc
+  - src/core/ext/xds/file_watcher_certificate_provider_factory.cc
+  - src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc
+  - src/core/ext/xds/xds_api.cc
+  - src/core/ext/xds/xds_bootstrap.cc
+  - src/core/ext/xds/xds_certificate_provider.cc
+  - src/core/ext/xds/xds_client.cc
+  - src/core/ext/xds/xds_client_stats.cc
   - src/core/lib/avl/avl.cc
   - src/core/lib/backoff/backoff.cc
   - src/core/lib/channel/channel_args.cc
@@ -970,6 +1210,7 @@ libs:
   - src/core/lib/iomgr/is_epollexclusive_available.cc
   - src/core/lib/iomgr/load_file.cc
   - src/core/lib/iomgr/lockfree_event.cc
+  - src/core/lib/iomgr/parse_address.cc
   - src/core/lib/iomgr/poller/eventmanager_libuv.cc
   - src/core/lib/iomgr/polling_entity.cc
   - src/core/lib/iomgr/pollset.cc
@@ -1025,7 +1266,10 @@ libs:
   - src/core/lib/iomgr/wakeup_fd_posix.cc
   - src/core/lib/iomgr/work_serializer.cc
   - src/core/lib/json/json_reader.cc
+  - src/core/lib/json/json_util.cc
   - src/core/lib/json/json_writer.cc
+  - src/core/lib/security/authorization/authorization_engine.cc
+  - src/core/lib/security/authorization/evaluate_args.cc
   - src/core/lib/security/context/security_context.cc
   - src/core/lib/security/credentials/alts/alts_credentials.cc
   - src/core/lib/security/credentials/alts/check_gcp_environment.cc
@@ -1038,10 +1282,15 @@ libs:
   - src/core/lib/security/credentials/composite/composite_credentials.cc
   - src/core/lib/security/credentials/credentials.cc
   - src/core/lib/security/credentials/credentials_metadata.cc
+  - src/core/lib/security/credentials/external/aws_request_signer.cc
+  - src/core/lib/security/credentials/external/external_account_credentials.cc
+  - src/core/lib/security/credentials/external/file_external_account_credentials.cc
+  - src/core/lib/security/credentials/external/url_external_account_credentials.cc
   - src/core/lib/security/credentials/fake/fake_credentials.cc
   - src/core/lib/security/credentials/google_default/credentials_generic.cc
   - src/core/lib/security/credentials/google_default/google_default_credentials.cc
   - src/core/lib/security/credentials/iam/iam_credentials.cc
+  - src/core/lib/security/credentials/insecure/insecure_credentials.cc
   - src/core/lib/security/credentials/jwt/json_token.cc
   - src/core/lib/security/credentials/jwt/jwt_credentials.cc
   - src/core/lib/security/credentials/jwt/jwt_verifier.cc
@@ -1049,10 +1298,14 @@ libs:
   - src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
   - src/core/lib/security/credentials/plugin/plugin_credentials.cc
   - src/core/lib/security/credentials/ssl/ssl_credentials.cc
+  - src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
+  - src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc
   - src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
   - src/core/lib/security/credentials/tls/tls_credentials.cc
+  - src/core/lib/security/credentials/xds/xds_credentials.cc
   - src/core/lib/security/security_connector/alts/alts_security_connector.cc
   - src/core/lib/security/security_connector/fake/fake_security_connector.cc
+  - src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
   - src/core/lib/security/security_connector/load_system_roots_fallback.cc
   - src/core/lib/security/security_connector/load_system_roots_linux.cc
   - src/core/lib/security/security_connector/local/local_security_connector.cc
@@ -1065,7 +1318,6 @@ libs:
   - src/core/lib/security/transport/secure_endpoint.cc
   - src/core/lib/security/transport/security_handshaker.cc
   - src/core/lib/security/transport/server_auth_filter.cc
-  - src/core/lib/security/transport/target_authority_table.cc
   - src/core/lib/security/transport/tsi_error.cc
   - src/core/lib/security/util/json_util.cc
   - src/core/lib/slice/b64.cc
@@ -1094,6 +1346,7 @@ libs:
   - src/core/lib/surface/server.cc
   - src/core/lib/surface/validate_metadata.cc
   - src/core/lib/surface/version.cc
+  - src/core/lib/transport/authority_override.cc
   - src/core/lib/transport/bdp_estimator.cc
   - src/core/lib/transport/byte_stream.cc
   - src/core/lib/transport/connectivity_state.cc
@@ -1142,8 +1395,12 @@ libs:
   - upb
   - absl/types:optional
   - absl/strings:strings
+  - absl/status:status
+  - absl/functional:bind_front
   - absl/container:inlined_vector
+  - absl/container:flat_hash_set
   baselib: true
+  deps_linkage: static
   dll: true
   generate_plugin_registry: true
   secure: true
@@ -1159,6 +1416,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  deps_linkage: static
   dll: only
 - name: grpc_test_util
   build: private
@@ -1167,6 +1425,7 @@ libs:
   headers:
   - test/core/util/cmdline.h
   - test/core/util/debugger_macros.h
+  - test/core/util/eval_args_mock_endpoint.h
   - test/core/util/fuzzer_util.h
   - test/core/util/grpc_profiler.h
   - test/core/util/histogram.h
@@ -1177,7 +1436,9 @@ libs:
   - test/core/util/port.h
   - test/core/util/port_server_client.h
   - test/core/util/reconnect_server.h
+  - test/core/util/resolve_localhost_ip46.h
   - test/core/util/slice_splitter.h
+  - test/core/util/stack_tracer.h
   - test/core/util/subprocess.h
   - test/core/util/test_config.h
   - test/core/util/test_tcp_server.h
@@ -1186,6 +1447,7 @@ libs:
   src:
   - test/core/util/cmdline.cc
   - test/core/util/debugger_macros.cc
+  - test/core/util/eval_args_mock_endpoint.cc
   - test/core/util/fuzzer_util.cc
   - test/core/util/grpc_profiler.cc
   - test/core/util/histogram.cc
@@ -1197,7 +1459,9 @@ libs:
   - test/core/util/port_isolated_runtime_environment.cc
   - test/core/util/port_server_client.cc
   - test/core/util/reconnect_server.cc
+  - test/core/util/resolve_localhost_ip46.cc
   - test/core/util/slice_splitter.cc
+  - test/core/util/stack_tracer.cc
   - test/core/util/subprocess_posix.cc
   - test/core/util/subprocess_windows.cc
   - test/core/util/test_config.cc
@@ -1209,6 +1473,9 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - absl/debugging:symbolize
+  - absl/debugging:stacktrace
+  - absl/debugging:failure_signal_handler
 - name: grpc_test_util_unsecure
   build: private
   language: c
@@ -1216,6 +1483,7 @@ libs:
   headers:
   - test/core/util/cmdline.h
   - test/core/util/debugger_macros.h
+  - test/core/util/eval_args_mock_endpoint.h
   - test/core/util/fuzzer_util.h
   - test/core/util/grpc_profiler.h
   - test/core/util/histogram.h
@@ -1226,7 +1494,9 @@ libs:
   - test/core/util/port.h
   - test/core/util/port_server_client.h
   - test/core/util/reconnect_server.h
+  - test/core/util/resolve_localhost_ip46.h
   - test/core/util/slice_splitter.h
+  - test/core/util/stack_tracer.h
   - test/core/util/subprocess.h
   - test/core/util/test_config.h
   - test/core/util/test_tcp_server.h
@@ -1235,6 +1505,7 @@ libs:
   src:
   - test/core/util/cmdline.cc
   - test/core/util/debugger_macros.cc
+  - test/core/util/eval_args_mock_endpoint.cc
   - test/core/util/fuzzer_util.cc
   - test/core/util/grpc_profiler.cc
   - test/core/util/histogram.cc
@@ -1246,7 +1517,9 @@ libs:
   - test/core/util/port_isolated_runtime_environment.cc
   - test/core/util/port_server_client.cc
   - test/core/util/reconnect_server.cc
+  - test/core/util/resolve_localhost_ip46.cc
   - test/core/util/slice_splitter.cc
+  - test/core/util/stack_tracer.cc
   - test/core/util/subprocess_posix.cc
   - test/core/util/subprocess_windows.cc
   - test/core/util/test_config.cc
@@ -1258,6 +1531,9 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - absl/debugging:symbolize
+  - absl/debugging:stacktrace
+  - absl/debugging:failure_signal_handler
   secure: false
 - name: grpc_unsecure
   build: all
@@ -1282,6 +1558,7 @@ libs:
   - src/core/ext/filters/client_channel/client_channel.h
   - src/core/ext/filters/client_channel/client_channel_channelz.h
   - src/core/ext/filters/client_channel/client_channel_factory.h
+  - src/core/ext/filters/client_channel/config_selector.h
   - src/core/ext/filters/client_channel/connector.h
   - src/core/ext/filters/client_channel/global_subchannel_pool.h
   - src/core/ext/filters/client_channel/health/health_check_client.h
@@ -1297,11 +1574,9 @@ libs:
   - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h
   - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h
   - src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds.h
   - src/core/ext/filters/client_channel/lb_policy_factory.h
   - src/core/ext/filters/client_channel/lb_policy_registry.h
   - src/core/ext/filters/client_channel/local_subchannel_pool.h
-  - src/core/ext/filters/client_channel/parse_address.h
   - src/core/ext/filters/client_channel/proxy_mapper.h
   - src/core/ext/filters/client_channel/proxy_mapper_registry.h
   - src/core/ext/filters/client_channel/resolver.h
@@ -1316,15 +1591,11 @@ libs:
   - src/core/ext/filters/client_channel/retry_throttle.h
   - src/core/ext/filters/client_channel/server_address.h
   - src/core/ext/filters/client_channel/service_config.h
+  - src/core/ext/filters/client_channel/service_config_call_data.h
+  - src/core/ext/filters/client_channel/service_config_parser.h
   - src/core/ext/filters/client_channel/subchannel.h
   - src/core/ext/filters/client_channel/subchannel_interface.h
   - src/core/ext/filters/client_channel/subchannel_pool_interface.h
-  - src/core/ext/filters/client_channel/xds/xds_api.h
-  - src/core/ext/filters/client_channel/xds/xds_bootstrap.h
-  - src/core/ext/filters/client_channel/xds/xds_channel.h
-  - src/core/ext/filters/client_channel/xds/xds_channel_args.h
-  - src/core/ext/filters/client_channel/xds/xds_client.h
-  - src/core/ext/filters/client_channel/xds/xds_client_stats.h
   - src/core/ext/filters/deadline/deadline_filter.h
   - src/core/ext/filters/http/client/http_client_filter.h
   - src/core/ext/filters/http/client_authority_filter.h
@@ -1361,56 +1632,11 @@ libs:
   - src/core/ext/transport/chttp2/transport/stream_map.h
   - src/core/ext/transport/chttp2/transport/varint.h
   - src/core/ext/transport/inproc/inproc_transport.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/api/v2/auth/cert.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cds.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cluster.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/address.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/base.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/discovery.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/eds.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/lds.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/listener.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/rds.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/route.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/route/route.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.h
-  - src/core/ext/upb-generated/envoy/api/v2/srds.upb.h
-  - src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.h
-  - src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.h
-  - src/core/ext/upb-generated/envoy/config/listener/v2/api_listener.upb.h
-  - src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.h
-  - src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.h
-  - src/core/ext/upb-generated/envoy/type/http.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/regex.upb.h
-  - src/core/ext/upb-generated/envoy/type/matcher/string.upb.h
-  - src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.h
-  - src/core/ext/upb-generated/envoy/type/percent.upb.h
-  - src/core/ext/upb-generated/envoy/type/range.upb.h
-  - src/core/ext/upb-generated/envoy/type/semantic_version.upb.h
-  - src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.h
-  - src/core/ext/upb-generated/gogoproto/gogo.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/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
@@ -1419,8 +1645,6 @@ libs:
   - src/core/ext/upb-generated/google/rpc/status.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/udpa/annotations/migrate.upb.h
-  - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
   - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h
   - src/core/ext/upb-generated/validate/validate.upb.h
   - src/core/lib/avl/avl.h
@@ -1449,8 +1673,7 @@ libs:
   - src/core/lib/debug/trace.h
   - src/core/lib/gprpp/atomic.h
   - src/core/lib/gprpp/debug_location.h
-  - src/core/lib/gprpp/inlined_vector.h
-  - src/core/lib/gprpp/optional.h
+  - src/core/lib/gprpp/dual_ref_counted.h
   - src/core/lib/gprpp/orphanable.h
   - src/core/lib/gprpp/ref_counted.h
   - src/core/lib/gprpp/ref_counted_ptr.h
@@ -1491,6 +1714,7 @@ libs:
   - src/core/lib/iomgr/load_file.h
   - src/core/lib/iomgr/lockfree_event.h
   - src/core/lib/iomgr/nameser.h
+  - src/core/lib/iomgr/parse_address.h
   - src/core/lib/iomgr/poller/eventmanager_libuv.h
   - src/core/lib/iomgr/polling_entity.h
   - src/core/lib/iomgr/pollset.h
@@ -1535,13 +1759,12 @@ libs:
   - src/core/lib/iomgr/wakeup_fd_posix.h
   - src/core/lib/iomgr/work_serializer.h
   - src/core/lib/json/json.h
+  - src/core/lib/json/json_util.h
   - src/core/lib/slice/b64.h
   - src/core/lib/slice/percent_encoding.h
-  - src/core/lib/slice/slice_hash_table.h
   - src/core/lib/slice/slice_internal.h
   - src/core/lib/slice/slice_string_helpers.h
   - src/core/lib/slice/slice_utils.h
-  - src/core/lib/slice/slice_weak_hash_table.h
   - src/core/lib/surface/api_trace.h
   - src/core/lib/surface/call.h
   - src/core/lib/surface/call_test_only.h
@@ -1555,6 +1778,7 @@ libs:
   - src/core/lib/surface/lame_client.h
   - src/core/lib/surface/server.h
   - src/core/lib/surface/validate_metadata.h
+  - src/core/lib/transport/authority_override.h
   - src/core/lib/transport/bdp_estimator.h
   - src/core/lib/transport/byte_stream.h
   - src/core/lib/transport/connectivity_state.h
@@ -1579,6 +1803,7 @@ libs:
   - src/core/ext/filters/client_channel/client_channel_channelz.cc
   - src/core/ext/filters/client_channel/client_channel_factory.cc
   - src/core/ext/filters/client_channel/client_channel_plugin.cc
+  - src/core/ext/filters/client_channel/config_selector.cc
   - src/core/ext/filters/client_channel/global_subchannel_pool.cc
   - src/core/ext/filters/client_channel/health/health_check_client.cc
   - src/core/ext/filters/client_channel/http_connect_handshaker.cc
@@ -1596,13 +1821,8 @@ libs:
   - src/core/ext/filters/client_channel/lb_policy/priority/priority.cc
   - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
   - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/eds.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
   - src/core/ext/filters/client_channel/lb_policy_registry.cc
   - src/core/ext/filters/client_channel/local_subchannel_pool.cc
-  - src/core/ext/filters/client_channel/parse_address.cc
   - src/core/ext/filters/client_channel/proxy_mapper_registry.cc
   - src/core/ext/filters/client_channel/resolver.cc
   - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -1619,20 +1839,16 @@ libs:
   - src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
   - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
   - src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
-  - src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
   - src/core/ext/filters/client_channel/resolver_registry.cc
   - src/core/ext/filters/client_channel/resolver_result_parsing.cc
   - src/core/ext/filters/client_channel/resolving_lb_policy.cc
   - src/core/ext/filters/client_channel/retry_throttle.cc
   - src/core/ext/filters/client_channel/server_address.cc
   - src/core/ext/filters/client_channel/service_config.cc
+  - src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
+  - src/core/ext/filters/client_channel/service_config_parser.cc
   - src/core/ext/filters/client_channel/subchannel.cc
   - src/core/ext/filters/client_channel/subchannel_pool_interface.cc
-  - src/core/ext/filters/client_channel/xds/xds_api.cc
-  - src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
-  - src/core/ext/filters/client_channel/xds/xds_channel.cc
-  - src/core/ext/filters/client_channel/xds/xds_client.cc
-  - src/core/ext/filters/client_channel/xds/xds_client_stats.cc
   - src/core/ext/filters/client_idle/client_idle_filter.cc
   - src/core/ext/filters/deadline/deadline_filter.cc
   - src/core/ext/filters/http/client/http_client_filter.cc
@@ -1678,56 +1894,11 @@ libs:
   - src/core/ext/transport/chttp2/transport/writing.cc
   - src/core/ext/transport/inproc/inproc_plugin.cc
   - src/core/ext/transport/inproc/inproc_transport.cc
-  - 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/api/v2/auth/cert.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cds.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cluster.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/eds.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/lds.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/listener.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/rds.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/route.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/route/route.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.c
-  - src/core/ext/upb-generated/envoy/api/v2/srds.upb.c
-  - src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.c
-  - src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.c
-  - src/core/ext/upb-generated/envoy/config/listener/v2/api_listener.upb.c
-  - src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c
-  - src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c
-  - src/core/ext/upb-generated/envoy/type/http.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/regex.upb.c
-  - src/core/ext/upb-generated/envoy/type/matcher/string.upb.c
-  - src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.c
-  - src/core/ext/upb-generated/envoy/type/percent.upb.c
-  - src/core/ext/upb-generated/envoy/type/range.upb.c
-  - src/core/ext/upb-generated/envoy/type/semantic_version.upb.c
-  - src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.c
-  - src/core/ext/upb-generated/gogoproto/gogo.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/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
@@ -1736,8 +1907,6 @@ libs:
   - src/core/ext/upb-generated/google/rpc/status.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/udpa/annotations/migrate.upb.c
-  - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
   - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
   - src/core/ext/upb-generated/validate/validate.upb.c
   - src/core/lib/avl/avl.cc
@@ -1806,6 +1975,7 @@ libs:
   - src/core/lib/iomgr/is_epollexclusive_available.cc
   - src/core/lib/iomgr/load_file.cc
   - src/core/lib/iomgr/lockfree_event.cc
+  - src/core/lib/iomgr/parse_address.cc
   - src/core/lib/iomgr/poller/eventmanager_libuv.cc
   - src/core/lib/iomgr/polling_entity.cc
   - src/core/lib/iomgr/pollset.cc
@@ -1861,6 +2031,7 @@ libs:
   - src/core/lib/iomgr/wakeup_fd_posix.cc
   - src/core/lib/iomgr/work_serializer.cc
   - src/core/lib/json/json_reader.cc
+  - src/core/lib/json/json_util.cc
   - src/core/lib/json/json_writer.cc
   - src/core/lib/slice/b64.cc
   - src/core/lib/slice/percent_encoding.cc
@@ -1888,6 +2059,7 @@ libs:
   - src/core/lib/surface/server.cc
   - src/core/lib/surface/validate_metadata.cc
   - src/core/lib/surface/version.cc
+  - src/core/lib/transport/authority_override.cc
   - src/core/lib/transport/bdp_estimator.cc
   - src/core/lib/transport/byte_stream.cc
   - src/core/lib/transport/connectivity_state.cc
@@ -1909,8 +2081,10 @@ libs:
   - upb
   - absl/types:optional
   - absl/strings:strings
+  - absl/status:status
   - absl/container:inlined_vector
   baselib: true
+  deps_linkage: static
   dll: true
   generate_plugin_registry: true
   secure: false
@@ -2019,31 +2193,22 @@ libs:
   - include/grpc++/support/sync_stream.h
   - include/grpc++/support/time.h
   - include/grpcpp/alarm.h
-  - include/grpcpp/alarm_impl.h
   - include/grpcpp/channel.h
-  - include/grpcpp/channel_impl.h
   - include/grpcpp/client_context.h
   - include/grpcpp/completion_queue.h
-  - include/grpcpp/completion_queue_impl.h
   - include/grpcpp/create_channel.h
-  - include/grpcpp/create_channel_impl.h
   - include/grpcpp/create_channel_posix.h
-  - include/grpcpp/create_channel_posix_impl.h
   - include/grpcpp/ext/health_check_service_server_builder_option.h
   - include/grpcpp/generic/async_generic_service.h
   - include/grpcpp/generic/generic_stub.h
-  - include/grpcpp/generic/generic_stub_impl.h
   - include/grpcpp/grpcpp.h
   - include/grpcpp/health_check_service_interface.h
-  - include/grpcpp/health_check_service_interface_impl.h
   - include/grpcpp/impl/call.h
   - include/grpcpp/impl/channel_argument_option.h
   - include/grpcpp/impl/client_unary_call.h
   - include/grpcpp/impl/codegen/async_generic_service.h
   - include/grpcpp/impl/codegen/async_stream.h
-  - include/grpcpp/impl/codegen/async_stream_impl.h
   - include/grpcpp/impl/codegen/async_unary_call.h
-  - include/grpcpp/impl/codegen/async_unary_call_impl.h
   - include/grpcpp/impl/codegen/byte_buffer.h
   - include/grpcpp/impl/codegen/call.h
   - include/grpcpp/impl/codegen/call_hook.h
@@ -2052,13 +2217,10 @@ libs:
   - include/grpcpp/impl/codegen/callback_common.h
   - include/grpcpp/impl/codegen/channel_interface.h
   - include/grpcpp/impl/codegen/client_callback.h
-  - include/grpcpp/impl/codegen/client_callback_impl.h
   - include/grpcpp/impl/codegen/client_context.h
-  - include/grpcpp/impl/codegen/client_context_impl.h
   - include/grpcpp/impl/codegen/client_interceptor.h
   - include/grpcpp/impl/codegen/client_unary_call.h
   - include/grpcpp/impl/codegen/completion_queue.h
-  - include/grpcpp/impl/codegen/completion_queue_impl.h
   - include/grpcpp/impl/codegen/completion_queue_tag.h
   - include/grpcpp/impl/codegen/config.h
   - include/grpcpp/impl/codegen/config_protobuf.h
@@ -2073,7 +2235,6 @@ libs:
   - include/grpcpp/impl/codegen/message_allocator.h
   - include/grpcpp/impl/codegen/metadata_map.h
   - include/grpcpp/impl/codegen/method_handler.h
-  - include/grpcpp/impl/codegen/method_handler_impl.h
   - include/grpcpp/impl/codegen/proto_buffer_reader.h
   - include/grpcpp/impl/codegen/proto_buffer_writer.h
   - include/grpcpp/impl/codegen/proto_utils.h
@@ -2083,9 +2244,7 @@ libs:
   - include/grpcpp/impl/codegen/serialization_traits.h
   - include/grpcpp/impl/codegen/server_callback.h
   - include/grpcpp/impl/codegen/server_callback_handlers.h
-  - include/grpcpp/impl/codegen/server_callback_impl.h
   - include/grpcpp/impl/codegen/server_context.h
-  - include/grpcpp/impl/codegen/server_context_impl.h
   - include/grpcpp/impl/codegen/server_interceptor.h
   - include/grpcpp/impl/codegen/server_interface.h
   - include/grpcpp/impl/codegen/service_type.h
@@ -2096,7 +2255,6 @@ libs:
   - include/grpcpp/impl/codegen/stub_options.h
   - include/grpcpp/impl/codegen/sync.h
   - include/grpcpp/impl/codegen/sync_stream.h
-  - include/grpcpp/impl/codegen/sync_stream_impl.h
   - include/grpcpp/impl/codegen/time.h
   - include/grpcpp/impl/grpc_library.h
   - include/grpcpp/impl/method_handler_impl.h
@@ -2104,37 +2262,25 @@ libs:
   - include/grpcpp/impl/rpc_service_method.h
   - include/grpcpp/impl/serialization_traits.h
   - include/grpcpp/impl/server_builder_option.h
-  - include/grpcpp/impl/server_builder_option_impl.h
   - include/grpcpp/impl/server_builder_plugin.h
   - include/grpcpp/impl/server_initializer.h
-  - include/grpcpp/impl/server_initializer_impl.h
   - include/grpcpp/impl/service_type.h
   - include/grpcpp/resource_quota.h
-  - include/grpcpp/resource_quota_impl.h
   - include/grpcpp/security/auth_context.h
   - include/grpcpp/security/auth_metadata_processor.h
-  - include/grpcpp/security/auth_metadata_processor_impl.h
   - include/grpcpp/security/credentials.h
-  - include/grpcpp/security/credentials_impl.h
   - include/grpcpp/security/server_credentials.h
-  - include/grpcpp/security/server_credentials_impl.h
+  - include/grpcpp/security/tls_certificate_provider.h
   - include/grpcpp/security/tls_credentials_options.h
   - include/grpcpp/server.h
   - include/grpcpp/server_builder.h
-  - include/grpcpp/server_builder_impl.h
   - include/grpcpp/server_context.h
-  - include/grpcpp/server_impl.h
   - include/grpcpp/server_posix.h
-  - include/grpcpp/server_posix_impl.h
   - include/grpcpp/support/async_stream.h
-  - include/grpcpp/support/async_stream_impl.h
   - include/grpcpp/support/async_unary_call.h
-  - include/grpcpp/support/async_unary_call_impl.h
   - include/grpcpp/support/byte_buffer.h
   - include/grpcpp/support/channel_arguments.h
-  - include/grpcpp/support/channel_arguments_impl.h
   - include/grpcpp/support/client_callback.h
-  - include/grpcpp/support/client_callback_impl.h
   - include/grpcpp/support/client_interceptor.h
   - include/grpcpp/support/config.h
   - include/grpcpp/support/interceptor.h
@@ -2143,7 +2289,6 @@ libs:
   - include/grpcpp/support/proto_buffer_reader.h
   - include/grpcpp/support/proto_buffer_writer.h
   - include/grpcpp/support/server_callback.h
-  - include/grpcpp/support/server_callback_impl.h
   - include/grpcpp/support/server_interceptor.h
   - include/grpcpp/support/slice.h
   - include/grpcpp/support/status.h
@@ -2151,7 +2296,6 @@ libs:
   - include/grpcpp/support/string_ref.h
   - include/grpcpp/support/stub_options.h
   - include/grpcpp/support/sync_stream.h
-  - include/grpcpp/support/sync_stream_impl.h
   - include/grpcpp/support/time.h
   - include/grpcpp/support/validate_service_config.h
   headers:
@@ -2168,6 +2312,7 @@ libs:
   - src/cpp/thread_manager/thread_manager.h
   src:
   - src/cpp/client/channel_cc.cc
+  - src/cpp/client/client_callback.cc
   - src/cpp/client/client_context.cc
   - src/cpp/client/client_interceptor.cc
   - src/cpp/client/create_channel.cc
@@ -2176,6 +2321,7 @@ libs:
   - src/cpp/client/credentials_cc.cc
   - src/cpp/client/insecure_credentials.cc
   - src/cpp/client/secure_credentials.cc
+  - src/cpp/client/xds_credentials.cc
   - src/cpp/codegen/codegen_init.cc
   - src/cpp/common/alarm.cc
   - src/cpp/common/auth_property_iterator.cc
@@ -2188,6 +2334,7 @@ libs:
   - src/cpp/common/secure_auth_context.cc
   - src/cpp/common/secure_channel_arguments.cc
   - src/cpp/common/secure_create_auth_context.cc
+  - src/cpp/common/tls_certificate_provider.cc
   - src/cpp/common/tls_credentials_options.cc
   - src/cpp/common/tls_credentials_options_util.cc
   - src/cpp/common/validate_service_config.cc
@@ -2243,7 +2390,6 @@ libs:
   public_headers:
   - include/grpc++/support/error_details.h
   - include/grpcpp/support/error_details.h
-  - include/grpcpp/support/error_details_impl.h
   headers: []
   src:
   - src/proto/grpc/status/status.proto
@@ -2260,7 +2406,6 @@ libs:
   public_headers:
   - include/grpc++/ext/proto_server_reflection_plugin.h
   - include/grpcpp/ext/proto_server_reflection_plugin.h
-  - include/grpcpp/ext/proto_server_reflection_plugin_impl.h
   headers:
   - src/cpp/ext/proto_server_reflection.h
   src:
@@ -2302,6 +2447,7 @@ libs:
   - test/cpp/util/test_config_cc.cc
   deps:
   - gpr
+  - absl/flags:parse
 - name: grpc++_test_util
   build: private
   language: c++
@@ -2330,6 +2476,7 @@ libs:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: grpc++_unsecure
   build: all
   language: c++
@@ -2412,31 +2559,22 @@ libs:
   - include/grpc++/support/sync_stream.h
   - include/grpc++/support/time.h
   - include/grpcpp/alarm.h
-  - include/grpcpp/alarm_impl.h
   - include/grpcpp/channel.h
-  - include/grpcpp/channel_impl.h
   - include/grpcpp/client_context.h
   - include/grpcpp/completion_queue.h
-  - include/grpcpp/completion_queue_impl.h
   - include/grpcpp/create_channel.h
-  - include/grpcpp/create_channel_impl.h
   - include/grpcpp/create_channel_posix.h
-  - include/grpcpp/create_channel_posix_impl.h
   - include/grpcpp/ext/health_check_service_server_builder_option.h
   - include/grpcpp/generic/async_generic_service.h
   - include/grpcpp/generic/generic_stub.h
-  - include/grpcpp/generic/generic_stub_impl.h
   - include/grpcpp/grpcpp.h
   - include/grpcpp/health_check_service_interface.h
-  - include/grpcpp/health_check_service_interface_impl.h
   - include/grpcpp/impl/call.h
   - include/grpcpp/impl/channel_argument_option.h
   - include/grpcpp/impl/client_unary_call.h
   - include/grpcpp/impl/codegen/async_generic_service.h
   - include/grpcpp/impl/codegen/async_stream.h
-  - include/grpcpp/impl/codegen/async_stream_impl.h
   - include/grpcpp/impl/codegen/async_unary_call.h
-  - include/grpcpp/impl/codegen/async_unary_call_impl.h
   - include/grpcpp/impl/codegen/byte_buffer.h
   - include/grpcpp/impl/codegen/call.h
   - include/grpcpp/impl/codegen/call_hook.h
@@ -2445,13 +2583,10 @@ libs:
   - include/grpcpp/impl/codegen/callback_common.h
   - include/grpcpp/impl/codegen/channel_interface.h
   - include/grpcpp/impl/codegen/client_callback.h
-  - include/grpcpp/impl/codegen/client_callback_impl.h
   - include/grpcpp/impl/codegen/client_context.h
-  - include/grpcpp/impl/codegen/client_context_impl.h
   - include/grpcpp/impl/codegen/client_interceptor.h
   - include/grpcpp/impl/codegen/client_unary_call.h
   - include/grpcpp/impl/codegen/completion_queue.h
-  - include/grpcpp/impl/codegen/completion_queue_impl.h
   - include/grpcpp/impl/codegen/completion_queue_tag.h
   - include/grpcpp/impl/codegen/config.h
   - include/grpcpp/impl/codegen/config_protobuf.h
@@ -2466,7 +2601,6 @@ libs:
   - include/grpcpp/impl/codegen/message_allocator.h
   - include/grpcpp/impl/codegen/metadata_map.h
   - include/grpcpp/impl/codegen/method_handler.h
-  - include/grpcpp/impl/codegen/method_handler_impl.h
   - include/grpcpp/impl/codegen/proto_buffer_reader.h
   - include/grpcpp/impl/codegen/proto_buffer_writer.h
   - include/grpcpp/impl/codegen/proto_utils.h
@@ -2476,9 +2610,7 @@ libs:
   - include/grpcpp/impl/codegen/serialization_traits.h
   - include/grpcpp/impl/codegen/server_callback.h
   - include/grpcpp/impl/codegen/server_callback_handlers.h
-  - include/grpcpp/impl/codegen/server_callback_impl.h
   - include/grpcpp/impl/codegen/server_context.h
-  - include/grpcpp/impl/codegen/server_context_impl.h
   - include/grpcpp/impl/codegen/server_interceptor.h
   - include/grpcpp/impl/codegen/server_interface.h
   - include/grpcpp/impl/codegen/service_type.h
@@ -2489,7 +2621,6 @@ libs:
   - include/grpcpp/impl/codegen/stub_options.h
   - include/grpcpp/impl/codegen/sync.h
   - include/grpcpp/impl/codegen/sync_stream.h
-  - include/grpcpp/impl/codegen/sync_stream_impl.h
   - include/grpcpp/impl/codegen/time.h
   - include/grpcpp/impl/grpc_library.h
   - include/grpcpp/impl/method_handler_impl.h
@@ -2497,37 +2628,25 @@ libs:
   - include/grpcpp/impl/rpc_service_method.h
   - include/grpcpp/impl/serialization_traits.h
   - include/grpcpp/impl/server_builder_option.h
-  - include/grpcpp/impl/server_builder_option_impl.h
   - include/grpcpp/impl/server_builder_plugin.h
   - include/grpcpp/impl/server_initializer.h
-  - include/grpcpp/impl/server_initializer_impl.h
   - include/grpcpp/impl/service_type.h
   - include/grpcpp/resource_quota.h
-  - include/grpcpp/resource_quota_impl.h
   - include/grpcpp/security/auth_context.h
   - include/grpcpp/security/auth_metadata_processor.h
-  - include/grpcpp/security/auth_metadata_processor_impl.h
   - include/grpcpp/security/credentials.h
-  - include/grpcpp/security/credentials_impl.h
   - include/grpcpp/security/server_credentials.h
-  - include/grpcpp/security/server_credentials_impl.h
+  - include/grpcpp/security/tls_certificate_provider.h
   - include/grpcpp/security/tls_credentials_options.h
   - include/grpcpp/server.h
   - include/grpcpp/server_builder.h
-  - include/grpcpp/server_builder_impl.h
   - include/grpcpp/server_context.h
-  - include/grpcpp/server_impl.h
   - include/grpcpp/server_posix.h
-  - include/grpcpp/server_posix_impl.h
   - include/grpcpp/support/async_stream.h
-  - include/grpcpp/support/async_stream_impl.h
   - include/grpcpp/support/async_unary_call.h
-  - include/grpcpp/support/async_unary_call_impl.h
   - include/grpcpp/support/byte_buffer.h
   - include/grpcpp/support/channel_arguments.h
-  - include/grpcpp/support/channel_arguments_impl.h
   - include/grpcpp/support/client_callback.h
-  - include/grpcpp/support/client_callback_impl.h
   - include/grpcpp/support/client_interceptor.h
   - include/grpcpp/support/config.h
   - include/grpcpp/support/interceptor.h
@@ -2536,7 +2655,6 @@ libs:
   - include/grpcpp/support/proto_buffer_reader.h
   - include/grpcpp/support/proto_buffer_writer.h
   - include/grpcpp/support/server_callback.h
-  - include/grpcpp/support/server_callback_impl.h
   - include/grpcpp/support/server_interceptor.h
   - include/grpcpp/support/slice.h
   - include/grpcpp/support/status.h
@@ -2544,7 +2662,6 @@ libs:
   - include/grpcpp/support/string_ref.h
   - include/grpcpp/support/stub_options.h
   - include/grpcpp/support/sync_stream.h
-  - include/grpcpp/support/sync_stream_impl.h
   - include/grpcpp/support/time.h
   - include/grpcpp/support/validate_service_config.h
   headers:
@@ -2557,6 +2674,7 @@ libs:
   - src/cpp/thread_manager/thread_manager.h
   src:
   - src/cpp/client/channel_cc.cc
+  - src/cpp/client/client_callback.cc
   - src/cpp/client/client_context.cc
   - src/cpp/client/client_interceptor.cc
   - src/cpp/client/create_channel.cc
@@ -2648,7 +2766,6 @@ libs:
   language: c++
   public_headers:
   - include/grpcpp/ext/channelz_service_plugin.h
-  - include/grpcpp/ext/channelz_service_plugin_impl.h
   headers:
   - src/cpp/server/channelz/channelz_service.h
   src:
@@ -3141,6 +3258,7 @@ targets:
   uses_polling: false
 - name: concurrent_connectivity_test
   build: test
+  run: false
   language: c
   headers: []
   src:
@@ -3178,7 +3296,7 @@ targets:
   - address_sorting
   - upb
   uses_polling: false
-- name: dns_resolver_connectivity_using_ares_resolver_test
+- name: dns_resolver_connectivity_using_ares_test
   build: test
   language: c
   headers: []
@@ -3192,7 +3310,7 @@ targets:
   - upb
   args:
   - --resolver=ares
-- name: dns_resolver_connectivity_using_native_resolver_test
+- name: dns_resolver_connectivity_using_native_test
   build: test
   language: c
   headers: []
@@ -3658,19 +3776,6 @@ targets:
   - linux
   - posix
   - mac
-- name: init_test
-  build: test
-  language: c
-  headers: []
-  src:
-  - test/core/surface/init_test.cc
-  deps:
-  - grpc_test_util
-  - grpc
-  - gpr
-  - address_sorting
-  - upb
-  uses_polling: false
 - name: inproc_callback_test
   build: test
   language: c
@@ -3904,7 +4009,7 @@ targets:
   language: c
   headers: []
   src:
-  - test/core/client_channel/parse_address_test.cc
+  - test/core/iomgr/parse_address_test.cc
   deps:
   - grpc_test_util
   - grpc
@@ -3916,7 +4021,7 @@ targets:
   language: c
   headers: []
   src:
-  - test/core/client_channel/parse_address_with_named_scope_id_test.cc
+  - test/core/iomgr/parse_address_with_named_scope_id_test.cc
   deps:
   - grpc_test_util
   - grpc
@@ -4089,26 +4194,9 @@ targets:
   build: test
   run: false
   language: c
-  headers:
-  - test/core/end2end/data/ssl_test_data.h
-  src:
-  - test/core/end2end/data/client_certs.cc
-  - test/core/end2end/data/server1_cert.cc
-  - test/core/end2end/data/server1_key.cc
-  - test/core/end2end/data/test_root_cert.cc
-  - test/core/surface/sequential_connectivity_test.cc
-  deps:
-  - grpc_test_util
-  - grpc
-  - gpr
-  - address_sorting
-  - upb
-- name: server_chttp2_test
-  build: test
-  language: c
   headers: []
   src:
-  - test/core/surface/server_chttp2_test.cc
+  - test/core/surface/sequential_connectivity_test.cc
   deps:
   - grpc_test_util
   - grpc
@@ -4554,7 +4642,7 @@ targets:
   language: c
   headers: []
   src:
-  - test/core/client_channel/uri_parser_test.cc
+  - test/core/uri/uri_parser_test.cc
   deps:
   - grpc_test_util
   - grpc
@@ -4673,7 +4761,6 @@ targets:
   platforms:
   - linux
   - posix
-  - mac
 - name: alts_credentials_fuzzer
   build: fuzzer
   language: c++
@@ -4688,6 +4775,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/security/corpus/alts_credentials_corpus
   maxlen: 2048
@@ -4743,6 +4831,32 @@ targets:
   - address_sorting
   - upb
   uses_polling: false
+- name: authorization_engine_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/security/authorization_engine_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
+- name: aws_request_signer_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/security/aws_request_signer_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: backoff_test
   gtest: true
   build: test
@@ -5168,6 +5282,7 @@ targets:
   - address_sorting
   - upb
   - benchmark
+  - absl/flags:flag
   benchmark: true
   defaults: benchmark
   platforms:
@@ -5318,6 +5433,7 @@ targets:
 - name: cancel_ares_query_test
   gtest: true
   build: test
+  run: false
   language: c++
   headers:
   - test/core/end2end/cq_verifier.h
@@ -5335,6 +5451,32 @@ targets:
   - gpr
   - address_sorting
   - upb
+- name: certificate_provider_registry_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/client_channel/certificate_provider_registry_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
+- name: certificate_provider_store_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/xds/certificate_provider_store_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: cfstream_test
   gtest: true
   build: test
@@ -5442,7 +5584,6 @@ targets:
 - name: channelz_test
   gtest: true
   build: test
-  run: false
   language: c++
   headers:
   - test/cpp/util/channel_trace_proto_helper.h
@@ -5489,6 +5630,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: client_callback_end2end_test
   gtest: true
   build: test
@@ -5552,6 +5694,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/end2end/fuzzers/client_fuzzer_corpus
   dict: test/core/end2end/fuzzers/hpack.dictionary
@@ -5716,6 +5859,19 @@ targets:
   - gpr
   - address_sorting
   - upb
+- name: dual_ref_counted_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/gprpp/dual_ref_counted_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: duplicate_header_bad_client_test
   gtest: true
   build: test
@@ -5774,6 +5930,19 @@ targets:
   - gpr
   - address_sorting
   - upb
+- name: evaluate_args_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/security/evaluate_args_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: eventmanager_libuv_test
   gtest: true
   build: test
@@ -5788,6 +5957,26 @@ targets:
   - address_sorting
   - upb
   uses_polling: false
+- name: examine_stack_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/gprpp/examine_stack_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
+  - absl/debugging:symbolize
+  - absl/debugging:stacktrace
+  platforms:
+  - linux
+  - posix
+  - mac
+  uses_polling: false
 - name: exception_test
   gtest: true
   build: test
@@ -5806,6 +5995,19 @@ targets:
   - gpr
   - address_sorting
   - upb
+- name: file_watcher_certificate_provider_factory_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/xds/file_watcher_certificate_provider_factory_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: filter_end2end_test
   gtest: true
   build: test
@@ -5897,6 +6099,19 @@ targets:
   - address_sorting
   - upb
   uses_polling: false
+- name: google_mesh_ca_certificate_provider_factory_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: grpc_cli
   build: test
   run: false
@@ -5925,6 +6140,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: grpc_cpp_plugin
   build: protoc
   language: c++
@@ -5988,17 +6204,25 @@ targets:
   deps:
   - grpc_plugin_support
   secure: false
+- name: grpc_tls_certificate_distributor_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/security/grpc_tls_certificate_distributor_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: grpc_tls_credentials_options_test
   gtest: true
   build: test
   language: c++
-  headers:
-  - test/core/end2end/data/ssl_test_data.h
+  headers: []
   src:
-  - test/core/end2end/data/client_certs.cc
-  - test/core/end2end/data/server1_cert.cc
-  - test/core/end2end/data/server1_key.cc
-  - test/core/end2end/data/test_root_cert.cc
   - test/core/security/grpc_tls_credentials_options_test.cc
   deps:
   - grpc_test_util
@@ -6038,6 +6262,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   platforms:
   - linux
   - posix
@@ -6171,6 +6396,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/transport/chttp2/hpack_parser_corpus
   dict: test/core/end2end/fuzzers/hpack.dictionary
@@ -6194,6 +6420,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: http_request_fuzzer_test
   build: fuzzer
   language: c++
@@ -6208,6 +6435,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/http/request_corpus
   maxlen: 2048
@@ -6225,6 +6453,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/http/response_corpus
   maxlen: 2048
@@ -6249,6 +6478,20 @@ targets:
   - gpr
   - address_sorting
   - upb
+- name: init_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/surface/init_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
+  uses_polling: false
 - name: initial_settings_frame_bad_client_test
   gtest: true
   build: test
@@ -6266,6 +6509,19 @@ targets:
   - gpr
   - address_sorting
   - upb
+- name: insecure_security_connector_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/security/insecure_security_connector_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: interop_client
   build: test
   run: false
@@ -6291,6 +6547,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: interop_server
   build: test
   run: false
@@ -6313,6 +6570,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: interop_test
   build: test
   language: c++
@@ -6328,6 +6586,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   platforms:
   - linux
   - posix
@@ -6346,6 +6605,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/json/corpus
   maxlen: 512
@@ -6483,6 +6743,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/nanopb/corpus_response
   maxlen: 128
@@ -6500,6 +6761,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/nanopb/corpus_serverlist
   maxlen: 128
@@ -6536,19 +6798,6 @@ targets:
   - benchmark
   benchmark: true
   defaults: benchmark
-- name: optional_test
-  gtest: true
-  build: test
-  language: c++
-  headers: []
-  src:
-  - test/core/gprpp/optional_test.cc
-  deps:
-  - grpc_test_util
-  - grpc
-  - gpr
-  - address_sorting
-  - upb
 - name: orphanable_test
   gtest: true
   build: test
@@ -6593,6 +6842,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/slice/percent_decode_corpus
   maxlen: 32
@@ -6610,6 +6860,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/slice/percent_encode_corpus
   maxlen: 32
@@ -6736,6 +6987,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: qps_worker
   build: test
   run: false
@@ -6778,6 +7030,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: raw_end2end_test
   gtest: true
   build: test
@@ -6825,6 +7078,23 @@ targets:
   - gpr
   - address_sorting
   - upb
+- name: remove_stream_from_stalled_lists_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
+  platforms:
+  - linux
+  - posix
+  - mac
 - name: retry_throttle_test
   gtest: true
   build: test
@@ -6917,6 +7187,19 @@ targets:
   - linux
   - posix
   - mac
+- name: server_chttp2_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/surface/server_chttp2_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: server_context_test_spouse_test
   gtest: true
   build: test
@@ -6965,6 +7248,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
   - test/core/end2end/fuzzers/server_fuzzer_corpus
   dict: test/core/end2end/fuzzers/hpack.dictionary
@@ -7113,56 +7397,57 @@ targets:
   - gpr
   - address_sorting
   - upb
-- name: slice_hash_table_test
-  gtest: true
-  build: test
+- name: ssl_server_fuzzer
+  build: fuzzer
   language: c++
   headers: []
   src:
-  - test/core/slice/slice_hash_table_test.cc
+  - test/core/security/ssl_server_fuzzer.cc
+  - test/core/util/fuzzer_corpus_test.cc
   deps:
   - grpc_test_util
+  - grpc++_test_config
   - grpc
   - gpr
   - address_sorting
   - upb
-  uses_polling: false
-- name: slice_weak_hash_table_test
+  - absl/flags:flag
+  corpus_dirs:
+  - test/core/security/corpus/ssl_server_corpus
+  maxlen: 2048
+- name: stack_tracer_test
   gtest: true
   build: test
   language: c++
   headers: []
   src:
-  - test/core/slice/slice_weak_hash_table_test.cc
+  - test/core/util/stack_tracer_test.cc
   deps:
   - grpc_test_util
   - grpc
   - gpr
   - address_sorting
   - upb
+  - absl/debugging:symbolize
+  platforms:
+  - linux
+  - posix
+  - mac
   uses_polling: false
-- name: ssl_server_fuzzer
-  build: fuzzer
+- name: stat_test
+  gtest: true
+  build: test
   language: c++
-  headers:
-  - test/core/end2end/data/ssl_test_data.h
+  headers: []
   src:
-  - test/core/end2end/data/client_certs.cc
-  - test/core/end2end/data/server1_cert.cc
-  - test/core/end2end/data/server1_key.cc
-  - test/core/end2end/data/test_root_cert.cc
-  - test/core/security/ssl_server_fuzzer.cc
-  - test/core/util/fuzzer_corpus_test.cc
+  - test/core/gprpp/stat_test.cc
   deps:
   - grpc_test_util
-  - grpc++_test_config
   - grpc
   - gpr
   - address_sorting
   - upb
-  corpus_dirs:
-  - test/core/security/corpus/ssl_server_corpus
-  maxlen: 2048
+  uses_polling: false
 - name: static_metadata_test
   gtest: true
   build: test
@@ -7218,6 +7503,26 @@ targets:
   - address_sorting
   - upb
   uses_polling: false
+- name: stranded_event_test
+  gtest: true
+  build: test
+  run: false
+  language: c++
+  headers:
+  - test/core/end2end/cq_verifier.h
+  src:
+  - test/core/end2end/cq_verifier.cc
+  - test/core/iomgr/stranded_event_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
+  platforms:
+  - linux
+  - posix
+  - mac
 - name: streaming_throughput_test
   gtest: true
   build: test
@@ -7256,26 +7561,27 @@ targets:
   - address_sorting
   - upb
   uses_polling: false
-- name: string_view_test
+- name: test_cpp_client_credentials_test
   gtest: true
   build: test
   language: c++
   headers: []
   src:
-  - test/core/gprpp/string_view_test.cc
+  - test/cpp/client/credentials_test.cc
   deps:
   - grpc_test_util
+  - grpc++
   - grpc
   - gpr
   - address_sorting
   - upb
-- name: test_cpp_client_credentials_test
+- name: test_cpp_server_credentials_test
   gtest: true
   build: test
   language: c++
   headers: []
   src:
-  - test/cpp/client/credentials_test.cc
+  - test/cpp/server/credentials_test.cc
   deps:
   - grpc_test_util
   - grpc++
@@ -7391,13 +7697,8 @@ targets:
   gtest: true
   build: test
   language: c++
-  headers:
-  - test/core/end2end/data/ssl_test_data.h
+  headers: []
   src:
-  - test/core/end2end/data/client_certs.cc
-  - test/core/end2end/data/server1_cert.cc
-  - test/core/end2end/data/server1_key.cc
-  - test/core/end2end/data/test_root_cert.cc
   - test/core/security/tls_security_connector_test.cc
   deps:
   - grpc_test_util
@@ -7405,6 +7706,24 @@ targets:
   - gpr
   - address_sorting
   - upb
+- name: too_many_pings_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - test/core/end2end/cq_verifier.h
+  src:
+  - test/core/end2end/cq_verifier.cc
+  - test/core/transport/chttp2/too_many_pings_test.cc
+  deps:
+  - grpc++_test_util
+  - grpc_test_util
+  - grpc++
+  - grpc++_test_config
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: unknown_frame_bad_client_test
   gtest: true
   build: test
@@ -7427,7 +7746,7 @@ targets:
   language: c++
   headers: []
   src:
-  - test/core/client_channel/uri_fuzzer_test.cc
+  - test/core/uri/uri_fuzzer_test.cc
   - test/core/util/fuzzer_corpus_test.cc
   deps:
   - grpc_test_util
@@ -7436,8 +7755,9 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
   corpus_dirs:
-  - test/core/client_channel/uri_corpus
+  - test/core/uri/uri_corpus
   maxlen: 128
 - name: window_overflow_bad_client_test
   gtest: true
@@ -7480,6 +7800,7 @@ targets:
   headers:
   - test/core/util/cmdline.h
   - test/core/util/debugger_macros.h
+  - test/core/util/eval_args_mock_endpoint.h
   - test/core/util/fuzzer_util.h
   - test/core/util/grpc_profiler.h
   - test/core/util/histogram.h
@@ -7490,7 +7811,9 @@ targets:
   - test/core/util/port.h
   - test/core/util/port_server_client.h
   - test/core/util/reconnect_server.h
+  - test/core/util/resolve_localhost_ip46.h
   - test/core/util/slice_splitter.h
+  - test/core/util/stack_tracer.h
   - test/core/util/subprocess.h
   - test/core/util/test_config.h
   - test/core/util/test_tcp_server.h
@@ -7502,6 +7825,7 @@ targets:
   - src/proto/grpc/testing/simple_messages.proto
   - test/core/util/cmdline.cc
   - test/core/util/debugger_macros.cc
+  - test/core/util/eval_args_mock_endpoint.cc
   - test/core/util/fuzzer_util.cc
   - test/core/util/grpc_profiler.cc
   - test/core/util/histogram.cc
@@ -7513,7 +7837,9 @@ targets:
   - test/core/util/port_isolated_runtime_environment.cc
   - test/core/util/port_server_client.cc
   - test/core/util/reconnect_server.cc
+  - test/core/util/resolve_localhost_ip46.cc
   - test/core/util/slice_splitter.cc
+  - test/core/util/stack_tracer.cc
   - test/core/util/subprocess_posix.cc
   - test/core/util/subprocess_windows.cc
   - test/core/util/test_config.cc
@@ -7527,6 +7853,9 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/debugging:symbolize
+  - absl/debugging:stacktrace
+  - absl/debugging:failure_signal_handler
   platforms:
   - linux
   - posix
@@ -7537,13 +7866,46 @@ targets:
   language: c++
   headers: []
   src:
-  - test/core/client_channel/xds_bootstrap_test.cc
+  - test/core/xds/xds_bootstrap_test.cc
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
+- name: xds_certificate_provider_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/xds/xds_certificate_provider_test.cc
   deps:
   - grpc_test_util
   - grpc
   - gpr
   - address_sorting
   - upb
+- name: xds_credentials_end2end_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
+  - test/cpp/end2end/test_service_impl.cc
+  - test/cpp/end2end/xds_credentials_end2end_test.cc
+  deps:
+  - grpc++_test_util
+  - grpc_test_util
+  - grpc++
+  - grpc
+  - gpr
+  - address_sorting
+  - upb
 - name: xds_end2end_test
   gtest: true
   build: test
@@ -7561,6 +7923,22 @@ targets:
   - src/proto/grpc/testing/xds/eds_for_test.proto
   - src/proto/grpc/testing/xds/lds_rds_for_test.proto
   - src/proto/grpc/testing/xds/lrs_for_test.proto
+  - src/proto/grpc/testing/xds/v3/address.proto
+  - src/proto/grpc/testing/xds/v3/ads.proto
+  - src/proto/grpc/testing/xds/v3/base.proto
+  - src/proto/grpc/testing/xds/v3/cluster.proto
+  - src/proto/grpc/testing/xds/v3/config_source.proto
+  - src/proto/grpc/testing/xds/v3/discovery.proto
+  - src/proto/grpc/testing/xds/v3/endpoint.proto
+  - src/proto/grpc/testing/xds/v3/http_connection_manager.proto
+  - src/proto/grpc/testing/xds/v3/listener.proto
+  - src/proto/grpc/testing/xds/v3/load_report.proto
+  - src/proto/grpc/testing/xds/v3/lrs.proto
+  - src/proto/grpc/testing/xds/v3/percent.proto
+  - src/proto/grpc/testing/xds/v3/protocol.proto
+  - src/proto/grpc/testing/xds/v3/range.proto
+  - src/proto/grpc/testing/xds/v3/regex.proto
+  - src/proto/grpc/testing/xds/v3/route.proto
   - test/cpp/end2end/test_service_impl.cc
   - test/cpp/end2end/xds_end2end_test.cc
   deps:
@@ -7593,6 +7971,7 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 - name: xds_interop_server
   build: test
   run: false
@@ -7611,4 +7990,5 @@ targets:
   - gpr
   - address_sorting
   - upb
+  - absl/flags:flag
 tests: []