Merge branch 'master' of github.com:grpc/grpc into uri_query_parts

9 years ago · f341374f6f
parent 057054f665 7894e60306
commit f341374f6f
34 changed files with 415 additions and 299 deletions
--- a/45
+++ b/45
@ -159,6 +159,8 @@ cc_library(
 cc_library(
  name = "grpc",
  srcs = [
+    "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+    "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
    "src/core/ext/transport/chttp2/transport/alpn.h",
    "src/core/ext/transport/chttp2/transport/bin_encoder.h",
    "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@ -198,9 +200,6 @@ cc_library(
    "src/core/lib/client_config/client_config.h",
    "src/core/lib/client_config/connector.h",
    "src/core/lib/client_config/initial_connect_string.h",
-    "src/core/lib/client_config/lb_policies/load_balancer_api.h",
-    "src/core/lib/client_config/lb_policies/pick_first.h",
-    "src/core/lib/client_config/lb_policies/round_robin.h",
    "src/core/lib/client_config/lb_policy.h",
    "src/core/lib/client_config/lb_policy_factory.h",
    "src/core/lib/client_config/lb_policy_registry.h",
@ -260,7 +259,6 @@ cc_library(
    "src/core/lib/json/json_common.h",
    "src/core/lib/json/json_reader.h",
    "src/core/lib/json/json_writer.h",
-    "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
    "src/core/lib/security/auth_filters.h",
    "src/core/lib/security/b64.h",
    "src/core/lib/security/credentials.h",
@ -296,6 +294,10 @@ cc_library(
    "src/core/lib/tsi/ssl_types.h",
    "src/core/lib/tsi/transport_security.h",
    "src/core/lib/tsi/transport_security_interface.h",
+    "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+    "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+    "src/core/ext/lb_policy/pick_first/pick_first.c",
+    "src/core/ext/lb_policy/round_robin/round_robin.c",
    "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
    "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
    "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@ -343,9 +345,6 @@ cc_library(
    "src/core/lib/client_config/connector.c",
    "src/core/lib/client_config/default_initial_connect_string.c",
    "src/core/lib/client_config/initial_connect_string.c",
-    "src/core/lib/client_config/lb_policies/load_balancer_api.c",
-    "src/core/lib/client_config/lb_policies/pick_first.c",
-    "src/core/lib/client_config/lb_policies/round_robin.c",
    "src/core/lib/client_config/lb_policy.c",
    "src/core/lib/client_config/lb_policy_factory.c",
    "src/core/lib/client_config/lb_policy_registry.c",
@ -411,7 +410,6 @@ cc_library(
    "src/core/lib/json/json_reader.c",
    "src/core/lib/json/json_string.c",
    "src/core/lib/json/json_writer.c",
-    "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
    "src/core/lib/security/b64.c",
    "src/core/lib/security/client_auth_filter.c",
    "src/core/lib/security/credentials.c",
@ -457,6 +455,7 @@ cc_library(
    "src/core/lib/tsi/fake_transport_security.c",
    "src/core/lib/tsi/ssl_transport_security.c",
    "src/core/lib/tsi/transport_security.c",
+    "src/core/plugin_registry/grpc_plugin_registry.c",
  ],
  hdrs = [
    "include/grpc/byte_buffer.h",
@ -530,6 +529,8 @@ cc_library(
 cc_library(
  name = "grpc_unsecure",
  srcs = [
+    "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+    "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
    "src/core/ext/transport/chttp2/transport/alpn.h",
    "src/core/ext/transport/chttp2/transport/bin_encoder.h",
    "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@ -569,9 +570,6 @@ cc_library(
    "src/core/lib/client_config/client_config.h",
    "src/core/lib/client_config/connector.h",
    "src/core/lib/client_config/initial_connect_string.h",
-    "src/core/lib/client_config/lb_policies/load_balancer_api.h",
-    "src/core/lib/client_config/lb_policies/pick_first.h",
-    "src/core/lib/client_config/lb_policies/round_robin.h",
    "src/core/lib/client_config/lb_policy.h",
    "src/core/lib/client_config/lb_policy_factory.h",
    "src/core/lib/client_config/lb_policy_registry.h",
@ -631,7 +629,6 @@ cc_library(
    "src/core/lib/json/json_common.h",
    "src/core/lib/json/json_reader.h",
    "src/core/lib/json/json_writer.h",
-    "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
    "src/core/lib/statistics/census_interface.h",
    "src/core/lib/statistics/census_rpc_stats.h",
    "src/core/lib/surface/api_trace.h",
@ -653,6 +650,10 @@ cc_library(
    "src/core/lib/transport/static_metadata.h",
    "src/core/lib/transport/transport.h",
    "src/core/lib/transport/transport_impl.h",
+    "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+    "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+    "src/core/ext/lb_policy/pick_first/pick_first.c",
+    "src/core/ext/lb_policy/round_robin/round_robin.c",
    "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
    "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
    "src/core/ext/transport/chttp2/transport/alpn.c",
@ -698,9 +699,6 @@ cc_library(
    "src/core/lib/client_config/connector.c",
    "src/core/lib/client_config/default_initial_connect_string.c",
    "src/core/lib/client_config/initial_connect_string.c",
-    "src/core/lib/client_config/lb_policies/load_balancer_api.c",
-    "src/core/lib/client_config/lb_policies/pick_first.c",
-    "src/core/lib/client_config/lb_policies/round_robin.c",
    "src/core/lib/client_config/lb_policy.c",
    "src/core/lib/client_config/lb_policy_factory.c",
    "src/core/lib/client_config/lb_policy_registry.c",
@ -765,7 +763,6 @@ cc_library(
    "src/core/lib/json/json_reader.c",
    "src/core/lib/json/json_string.c",
    "src/core/lib/json/json_writer.c",
-    "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
    "src/core/lib/surface/alarm.c",
    "src/core/lib/surface/api_trace.c",
    "src/core/lib/surface/byte_buffer.c",
@ -794,6 +791,7 @@ cc_library(
    "src/core/lib/transport/static_metadata.c",
    "src/core/lib/transport/transport.c",
    "src/core/lib/transport/transport_op_string.c",
+    "src/core/plugin_registry/grpc_unsecure_plugin_registry.c",
  ],
  hdrs = [
    "include/grpc/byte_buffer.h",
@ -1361,6 +1359,10 @@ objc_library(
 objc_library(
  name = "grpc_objc",
  srcs = [
+    "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+    "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+    "src/core/ext/lb_policy/pick_first/pick_first.c",
+    "src/core/ext/lb_policy/round_robin/round_robin.c",
    "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
    "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
    "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@ -1408,9 +1410,6 @@ objc_library(
    "src/core/lib/client_config/connector.c",
    "src/core/lib/client_config/default_initial_connect_string.c",
    "src/core/lib/client_config/initial_connect_string.c",
-    "src/core/lib/client_config/lb_policies/load_balancer_api.c",
-    "src/core/lib/client_config/lb_policies/pick_first.c",
-    "src/core/lib/client_config/lb_policies/round_robin.c",
    "src/core/lib/client_config/lb_policy.c",
    "src/core/lib/client_config/lb_policy_factory.c",
    "src/core/lib/client_config/lb_policy_registry.c",
@ -1476,7 +1475,6 @@ objc_library(
    "src/core/lib/json/json_reader.c",
    "src/core/lib/json/json_string.c",
    "src/core/lib/json/json_writer.c",
-    "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
    "src/core/lib/security/b64.c",
    "src/core/lib/security/client_auth_filter.c",
    "src/core/lib/security/credentials.c",
@ -1522,6 +1520,7 @@ objc_library(
    "src/core/lib/tsi/fake_transport_security.c",
    "src/core/lib/tsi/ssl_transport_security.c",
    "src/core/lib/tsi/transport_security.c",
+    "src/core/plugin_registry/grpc_plugin_registry.c",
  ],
  hdrs = [
    "include/grpc/byte_buffer.h",
@ -1537,6 +1536,8 @@ objc_library(
    "include/grpc/impl/codegen/propagation_bits.h",
    "include/grpc/impl/codegen/status.h",
    "include/grpc/status.h",
+    "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+    "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
    "src/core/ext/transport/chttp2/transport/alpn.h",
    "src/core/ext/transport/chttp2/transport/bin_encoder.h",
    "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@ -1576,9 +1577,6 @@ objc_library(
    "src/core/lib/client_config/client_config.h",
    "src/core/lib/client_config/connector.h",
    "src/core/lib/client_config/initial_connect_string.h",
-    "src/core/lib/client_config/lb_policies/load_balancer_api.h",
-    "src/core/lib/client_config/lb_policies/pick_first.h",
-    "src/core/lib/client_config/lb_policies/round_robin.h",
    "src/core/lib/client_config/lb_policy.h",
    "src/core/lib/client_config/lb_policy_factory.h",
    "src/core/lib/client_config/lb_policy_registry.h",
@ -1638,7 +1636,6 @@ objc_library(
    "src/core/lib/json/json_common.h",
    "src/core/lib/json/json_reader.h",
    "src/core/lib/json/json_writer.h",
-    "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
    "src/core/lib/security/auth_filters.h",
    "src/core/lib/security/b64.h",
    "src/core/lib/security/credentials.h",
--- a/19
+++ b/19
@ -2440,6 +2440,10 @@ endif


 LIBGRPC_SRC = \
+    src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+    src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
+    src/core/ext/lb_policy/pick_first/pick_first.c \
+    src/core/ext/lb_policy/round_robin/round_robin.c \
    src/core/ext/transport/chttp2/client/insecure/channel_create.c \
    src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
@ -2487,9 +2491,6 @@ LIBGRPC_SRC = \
    src/core/lib/client_config/connector.c \
    src/core/lib/client_config/default_initial_connect_string.c \
    src/core/lib/client_config/initial_connect_string.c \
-    src/core/lib/client_config/lb_policies/load_balancer_api.c \
-    src/core/lib/client_config/lb_policies/pick_first.c \
-    src/core/lib/client_config/lb_policies/round_robin.c \
    src/core/lib/client_config/lb_policy.c \
    src/core/lib/client_config/lb_policy_factory.c \
    src/core/lib/client_config/lb_policy_registry.c \
@ -2555,7 +2556,6 @@ LIBGRPC_SRC = \
    src/core/lib/json/json_reader.c \
    src/core/lib/json/json_string.c \
    src/core/lib/json/json_writer.c \
-    src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c \
    src/core/lib/security/b64.c \
    src/core/lib/security/client_auth_filter.c \
    src/core/lib/security/credentials.c \
@ -2601,6 +2601,7 @@ LIBGRPC_SRC = \
    src/core/lib/tsi/fake_transport_security.c \
    src/core/lib/tsi/ssl_transport_security.c \
    src/core/lib/tsi/transport_security.c \
+    src/core/plugin_registry/grpc_plugin_registry.c \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -2801,6 +2802,10 @@ endif


 LIBGRPC_UNSECURE_SRC = \
+    src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+    src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
+    src/core/ext/lb_policy/pick_first/pick_first.c \
+    src/core/ext/lb_policy/round_robin/round_robin.c \
    src/core/ext/transport/chttp2/client/insecure/channel_create.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
    src/core/ext/transport/chttp2/transport/alpn.c \
@ -2846,9 +2851,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/client_config/connector.c \
    src/core/lib/client_config/default_initial_connect_string.c \
    src/core/lib/client_config/initial_connect_string.c \
-    src/core/lib/client_config/lb_policies/load_balancer_api.c \
-    src/core/lib/client_config/lb_policies/pick_first.c \
-    src/core/lib/client_config/lb_policies/round_robin.c \
    src/core/lib/client_config/lb_policy.c \
    src/core/lib/client_config/lb_policy_factory.c \
    src/core/lib/client_config/lb_policy_registry.c \
@ -2913,7 +2915,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/json/json_reader.c \
    src/core/lib/json/json_string.c \
    src/core/lib/json/json_writer.c \
-    src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c \
    src/core/lib/surface/alarm.c \
    src/core/lib/surface/api_trace.c \
    src/core/lib/surface/byte_buffer.c \
@ -2942,6 +2943,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/transport/static_metadata.c \
    src/core/lib/transport/transport.c \
    src/core/lib/transport/transport_op_string.c \
+    src/core/plugin_registry/grpc_unsecure_plugin_registry.c \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -13738,6 +13740,7 @@ src/core/lib/surface/init_secure.c: $(OPENSSL_DEP)
 src/core/lib/tsi/fake_transport_security.c: $(OPENSSL_DEP)
 src/core/lib/tsi/ssl_transport_security.c: $(OPENSSL_DEP)
 src/core/lib/tsi/transport_security.c: $(OPENSSL_DEP)
+src/core/plugin_registry/grpc_plugin_registry.c: $(OPENSSL_DEP)
 src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP)
 src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP)
 src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP)
--- a/binding.gyp
+++ b/binding.gyp
@ -558,6 +558,10 @@
        'gpr',
      ],
      'sources': [
+        'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
+        'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
+        'src/core/ext/lb_policy/pick_first/pick_first.c',
+        'src/core/ext/lb_policy/round_robin/round_robin.c',
        'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
        'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
        'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
@ -605,9 +609,6 @@
        'src/core/lib/client_config/connector.c',
        'src/core/lib/client_config/default_initial_connect_string.c',
        'src/core/lib/client_config/initial_connect_string.c',
-        'src/core/lib/client_config/lb_policies/load_balancer_api.c',
-        'src/core/lib/client_config/lb_policies/pick_first.c',
-        'src/core/lib/client_config/lb_policies/round_robin.c',
        'src/core/lib/client_config/lb_policy.c',
        'src/core/lib/client_config/lb_policy_factory.c',
        'src/core/lib/client_config/lb_policy_registry.c',
@ -673,7 +674,6 @@
        'src/core/lib/json/json_reader.c',
        'src/core/lib/json/json_string.c',
        'src/core/lib/json/json_writer.c',
-        'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c',
        'src/core/lib/security/b64.c',
        'src/core/lib/security/client_auth_filter.c',
        'src/core/lib/security/credentials.c',
@ -719,6 +719,7 @@
        'src/core/lib/tsi/fake_transport_security.c',
        'src/core/lib/tsi/ssl_transport_security.c',
        'src/core/lib/tsi/transport_security.c',
+        'src/core/plugin_registry/grpc_plugin_registry.c',
        'third_party/nanopb/pb_common.c',
        'third_party/nanopb/pb_decode.c',
        'third_party/nanopb/pb_encode.c',
--- a/build.yaml
+++ b/build.yaml
@ -262,9 +262,6 @@ filegroups:
  - src/core/lib/client_config/client_config.h
  - src/core/lib/client_config/connector.h
  - src/core/lib/client_config/initial_connect_string.h
-  - src/core/lib/client_config/lb_policies/load_balancer_api.h
-  - src/core/lib/client_config/lb_policies/pick_first.h
-  - src/core/lib/client_config/lb_policies/round_robin.h
  - src/core/lib/client_config/lb_policy.h
  - src/core/lib/client_config/lb_policy_factory.h
  - src/core/lib/client_config/lb_policy_registry.h
@ -324,7 +321,6 @@ filegroups:
  - src/core/lib/json/json_common.h
  - src/core/lib/json/json_reader.h
  - src/core/lib/json/json_writer.h
-  - src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h
  - src/core/lib/statistics/census_interface.h
  - src/core/lib/statistics/census_rpc_stats.h
  - src/core/lib/surface/api_trace.h
@ -363,9 +359,6 @@ filegroups:
  - src/core/lib/client_config/connector.c
  - src/core/lib/client_config/default_initial_connect_string.c
  - src/core/lib/client_config/initial_connect_string.c
-  - src/core/lib/client_config/lb_policies/load_balancer_api.c
-  - src/core/lib/client_config/lb_policies/pick_first.c
-  - src/core/lib/client_config/lb_policies/round_robin.c
  - src/core/lib/client_config/lb_policy.c
  - src/core/lib/client_config/lb_policy_factory.c
  - src/core/lib/client_config/lb_policy_registry.c
@ -430,7 +423,6 @@ filegroups:
  - src/core/lib/json/json_reader.c
  - src/core/lib/json/json_string.c
  - src/core/lib/json/json_writer.c
-  - src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c
  - src/core/lib/surface/alarm.c
  - src/core/lib/surface/api_trace.c
  - src/core/lib/surface/byte_buffer.c
@ -466,6 +458,27 @@ filegroups:
  - include/grpc/impl/codegen/grpc_types.h
  - include/grpc/impl/codegen/propagation_bits.h
  - include/grpc/impl/codegen/status.h
+- name: grpc_lb_policy_grpclb
+  headers:
+  - src/core/ext/lb_policy/grpclb/load_balancer_api.h
+  - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
+  src:
+  - src/core/ext/lb_policy/grpclb/load_balancer_api.c
+  - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
+  uses:
+  - grpc_base
+- name: grpc_lb_policy_pick_first
+  src:
+  - src/core/ext/lb_policy/pick_first/pick_first.c
+  plugin: grpc_lb_policy_pick_first
+  uses:
+  - grpc_base
+- name: grpc_lb_policy_round_robin
+  src:
+  - src/core/ext/lb_policy/round_robin/round_robin.c
+  plugin: grpc_lb_policy_round_robin
+  uses:
+  - grpc_base
 - name: grpc_secure
  headers:
  - src/core/lib/security/auth_filters.h
@ -639,10 +652,14 @@ libs:
  - grpc_transport_chttp2_client_secure
  - grpc_transport_chttp2_server_insecure
  - grpc_transport_chttp2_client_insecure
+  - grpc_lb_policy_grpclb
+  - grpc_lb_policy_pick_first
+  - grpc_lb_policy_round_robin
  - grpc_secure
  - grpc_codegen
  - census
  - nanopb
+  generate_plugin_registry: true
  secure: true
  vs_packages:
  - grpc.dependencies.openssl
@ -722,9 +739,13 @@ libs:
  - grpc_base
  - grpc_transport_chttp2_server_insecure
  - grpc_transport_chttp2_client_insecure
+  - grpc_lb_policy_grpclb
+  - grpc_lb_policy_pick_first
+  - grpc_lb_policy_round_robin
  - grpc_codegen
  - census
  - nanopb
+  generate_plugin_registry: true
  secure: false
  vs_project_guid: '{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}'
 - name: grpc_zookeeper
--- a/config.m4
+++ b/config.m4
@ -80,6 +80,10 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/support/tmpfile_posix.c \
    src/core/lib/support/tmpfile_win32.c \
    src/core/lib/support/wrap_memcpy.c \
+    src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+    src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
+    src/core/ext/lb_policy/pick_first/pick_first.c \
+    src/core/ext/lb_policy/round_robin/round_robin.c \
    src/core/ext/transport/chttp2/client/insecure/channel_create.c \
    src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
@ -127,9 +131,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/client_config/connector.c \
    src/core/lib/client_config/default_initial_connect_string.c \
    src/core/lib/client_config/initial_connect_string.c \
-    src/core/lib/client_config/lb_policies/load_balancer_api.c \
-    src/core/lib/client_config/lb_policies/pick_first.c \
-    src/core/lib/client_config/lb_policies/round_robin.c \
    src/core/lib/client_config/lb_policy.c \
    src/core/lib/client_config/lb_policy_factory.c \
    src/core/lib/client_config/lb_policy_registry.c \
@ -195,7 +196,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/json/json_reader.c \
    src/core/lib/json/json_string.c \
    src/core/lib/json/json_writer.c \
-    src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c \
    src/core/lib/security/b64.c \
    src/core/lib/security/client_auth_filter.c \
    src/core/lib/security/credentials.c \
@ -241,6 +241,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/tsi/fake_transport_security.c \
    src/core/lib/tsi/ssl_transport_security.c \
    src/core/lib/tsi/transport_security.c \
+    src/core/plugin_registry/grpc_plugin_registry.c \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -546,6 +547,10 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)

  PHP_ADD_BUILD_DIR($ext_builddir/src/boringssl)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/pick_first)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/round_robin)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client/insecure)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client/secure)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/insecure)
@ -554,7 +559,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/census)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/client_config)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/client_config/lb_policies)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/client_config/resolvers)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug)
@ -562,12 +566,12 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/profiling)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/proto/grpc/lb/v0)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/support)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/tsi)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/aes)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/asn1)
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -161,6 +161,8 @@ Pod::Spec.new do |s|
                      'src/core/lib/support/tmpfile_posix.c',
                      'src/core/lib/support/tmpfile_win32.c',
                      'src/core/lib/support/wrap_memcpy.c',
+                      'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
+                      'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
                      'src/core/ext/transport/chttp2/transport/alpn.h',
                      'src/core/ext/transport/chttp2/transport/bin_encoder.h',
                      'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
@ -200,9 +202,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/client_config/client_config.h',
                      'src/core/lib/client_config/connector.h',
                      'src/core/lib/client_config/initial_connect_string.h',
-                      'src/core/lib/client_config/lb_policies/load_balancer_api.h',
-                      'src/core/lib/client_config/lb_policies/pick_first.h',
-                      'src/core/lib/client_config/lb_policies/round_robin.h',
                      'src/core/lib/client_config/lb_policy.h',
                      'src/core/lib/client_config/lb_policy_factory.h',
                      'src/core/lib/client_config/lb_policy_registry.h',
@ -262,7 +261,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/json/json_common.h',
                      'src/core/lib/json/json_reader.h',
                      'src/core/lib/json/json_writer.h',
-                      'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h',
                      'src/core/lib/security/auth_filters.h',
                      'src/core/lib/security/b64.h',
                      'src/core/lib/security/credentials.h',
@ -315,6 +313,10 @@ Pod::Spec.new do |s|
                      'include/grpc/impl/codegen/propagation_bits.h',
                      'include/grpc/impl/codegen/status.h',
                      'include/grpc/status.h',
+                      'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
+                      'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
+                      'src/core/ext/lb_policy/pick_first/pick_first.c',
+                      'src/core/ext/lb_policy/round_robin/round_robin.c',
                      'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
                      'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
                      'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
@ -362,9 +364,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/client_config/connector.c',
                      'src/core/lib/client_config/default_initial_connect_string.c',
                      'src/core/lib/client_config/initial_connect_string.c',
-                      'src/core/lib/client_config/lb_policies/load_balancer_api.c',
-                      'src/core/lib/client_config/lb_policies/pick_first.c',
-                      'src/core/lib/client_config/lb_policies/round_robin.c',
                      'src/core/lib/client_config/lb_policy.c',
                      'src/core/lib/client_config/lb_policy_factory.c',
                      'src/core/lib/client_config/lb_policy_registry.c',
@ -430,7 +429,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/json/json_reader.c',
                      'src/core/lib/json/json_string.c',
                      'src/core/lib/json/json_writer.c',
-                      'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c',
                      'src/core/lib/security/b64.c',
                      'src/core/lib/security/client_auth_filter.c',
                      'src/core/lib/security/credentials.c',
@ -476,6 +474,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/tsi/fake_transport_security.c',
                      'src/core/lib/tsi/ssl_transport_security.c',
                      'src/core/lib/tsi/transport_security.c',
+                      'src/core/plugin_registry/grpc_plugin_registry.c',
                      'third_party/nanopb/pb_common.c',
                      'third_party/nanopb/pb_decode.c',
                      'third_party/nanopb/pb_encode.c'
@ -492,6 +491,8 @@ Pod::Spec.new do |s|
                              'src/core/lib/support/thd_internal.h',
                              'src/core/lib/support/time_precise.h',
                              'src/core/lib/support/tmpfile.h',
+                              'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
+                              'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
                              'src/core/ext/transport/chttp2/transport/alpn.h',
                              'src/core/ext/transport/chttp2/transport/bin_encoder.h',
                              'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
@ -531,9 +532,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/client_config/client_config.h',
                              'src/core/lib/client_config/connector.h',
                              'src/core/lib/client_config/initial_connect_string.h',
-                              'src/core/lib/client_config/lb_policies/load_balancer_api.h',
-                              'src/core/lib/client_config/lb_policies/pick_first.h',
-                              'src/core/lib/client_config/lb_policies/round_robin.h',
                              'src/core/lib/client_config/lb_policy.h',
                              'src/core/lib/client_config/lb_policy_factory.h',
                              'src/core/lib/client_config/lb_policy_registry.h',
@ -593,7 +591,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/json/json_common.h',
                              'src/core/lib/json/json_reader.h',
                              'src/core/lib/json/json_writer.h',
-                              'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h',
                              'src/core/lib/security/auth_filters.h',
                              'src/core/lib/security/b64.h',
                              'src/core/lib/security/credentials.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -157,6 +157,8 @@ Gem::Specification.new do |s|
  s.files += %w( include/grpc/impl/codegen/propagation_bits.h )
  s.files += %w( include/grpc/impl/codegen/status.h )
  s.files += %w( include/grpc/status.h )
+  s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h )
+  s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/alpn.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.h )
@ -196,9 +198,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/client_config/client_config.h )
  s.files += %w( src/core/lib/client_config/connector.h )
  s.files += %w( src/core/lib/client_config/initial_connect_string.h )
-  s.files += %w( src/core/lib/client_config/lb_policies/load_balancer_api.h )
-  s.files += %w( src/core/lib/client_config/lb_policies/pick_first.h )
-  s.files += %w( src/core/lib/client_config/lb_policies/round_robin.h )
  s.files += %w( src/core/lib/client_config/lb_policy.h )
  s.files += %w( src/core/lib/client_config/lb_policy_factory.h )
  s.files += %w( src/core/lib/client_config/lb_policy_registry.h )
@ -258,7 +257,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/json/json_common.h )
  s.files += %w( src/core/lib/json/json_reader.h )
  s.files += %w( src/core/lib/json/json_writer.h )
-  s.files += %w( src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h )
  s.files += %w( src/core/lib/security/auth_filters.h )
  s.files += %w( src/core/lib/security/b64.h )
  s.files += %w( src/core/lib/security/credentials.h )
@ -298,6 +296,10 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/nanopb/pb_common.h )
  s.files += %w( third_party/nanopb/pb_decode.h )
  s.files += %w( third_party/nanopb/pb_encode.h )
+  s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c )
+  s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c )
+  s.files += %w( src/core/ext/lb_policy/pick_first/pick_first.c )
+  s.files += %w( src/core/ext/lb_policy/round_robin/round_robin.c )
  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c )
  s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.c )
  s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c )
@ -345,9 +347,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/client_config/connector.c )
  s.files += %w( src/core/lib/client_config/default_initial_connect_string.c )
  s.files += %w( src/core/lib/client_config/initial_connect_string.c )
-  s.files += %w( src/core/lib/client_config/lb_policies/load_balancer_api.c )
-  s.files += %w( src/core/lib/client_config/lb_policies/pick_first.c )
-  s.files += %w( src/core/lib/client_config/lb_policies/round_robin.c )
  s.files += %w( src/core/lib/client_config/lb_policy.c )
  s.files += %w( src/core/lib/client_config/lb_policy_factory.c )
  s.files += %w( src/core/lib/client_config/lb_policy_registry.c )
@ -413,7 +412,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/json/json_reader.c )
  s.files += %w( src/core/lib/json/json_string.c )
  s.files += %w( src/core/lib/json/json_writer.c )
-  s.files += %w( src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c )
  s.files += %w( src/core/lib/security/b64.c )
  s.files += %w( src/core/lib/security/client_auth_filter.c )
  s.files += %w( src/core/lib/security/credentials.c )
@ -459,6 +457,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/tsi/fake_transport_security.c )
  s.files += %w( src/core/lib/tsi/ssl_transport_security.c )
  s.files += %w( src/core/lib/tsi/transport_security.c )
+  s.files += %w( src/core/plugin_registry/grpc_plugin_registry.c )
  s.files += %w( third_party/nanopb/pb_common.c )
  s.files += %w( third_party/nanopb/pb_decode.c )
  s.files += %w( third_party/nanopb/pb_encode.c )
--- a/package.json
+++ b/package.json
@ -100,6 +100,8 @@
    "include/grpc/impl/codegen/propagation_bits.h",
    "include/grpc/impl/codegen/status.h",
    "include/grpc/status.h",
+    "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+    "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
    "src/core/ext/transport/chttp2/transport/alpn.h",
    "src/core/ext/transport/chttp2/transport/bin_encoder.h",
    "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@ -139,9 +141,6 @@
    "src/core/lib/client_config/client_config.h",
    "src/core/lib/client_config/connector.h",
    "src/core/lib/client_config/initial_connect_string.h",
-    "src/core/lib/client_config/lb_policies/load_balancer_api.h",
-    "src/core/lib/client_config/lb_policies/pick_first.h",
-    "src/core/lib/client_config/lb_policies/round_robin.h",
    "src/core/lib/client_config/lb_policy.h",
    "src/core/lib/client_config/lb_policy_factory.h",
    "src/core/lib/client_config/lb_policy_registry.h",
@ -201,7 +200,6 @@
    "src/core/lib/json/json_common.h",
    "src/core/lib/json/json_reader.h",
    "src/core/lib/json/json_writer.h",
-    "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
    "src/core/lib/security/auth_filters.h",
    "src/core/lib/security/b64.h",
    "src/core/lib/security/credentials.h",
@ -241,6 +239,10 @@
    "third_party/nanopb/pb_common.h",
    "third_party/nanopb/pb_decode.h",
    "third_party/nanopb/pb_encode.h",
+    "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+    "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+    "src/core/ext/lb_policy/pick_first/pick_first.c",
+    "src/core/ext/lb_policy/round_robin/round_robin.c",
    "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
    "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
    "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@ -288,9 +290,6 @@
    "src/core/lib/client_config/connector.c",
    "src/core/lib/client_config/default_initial_connect_string.c",
    "src/core/lib/client_config/initial_connect_string.c",
-    "src/core/lib/client_config/lb_policies/load_balancer_api.c",
-    "src/core/lib/client_config/lb_policies/pick_first.c",
-    "src/core/lib/client_config/lb_policies/round_robin.c",
    "src/core/lib/client_config/lb_policy.c",
    "src/core/lib/client_config/lb_policy_factory.c",
    "src/core/lib/client_config/lb_policy_registry.c",
@ -356,7 +355,6 @@
    "src/core/lib/json/json_reader.c",
    "src/core/lib/json/json_string.c",
    "src/core/lib/json/json_writer.c",
-    "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
    "src/core/lib/security/b64.c",
    "src/core/lib/security/client_auth_filter.c",
    "src/core/lib/security/credentials.c",
@ -402,6 +400,7 @@
    "src/core/lib/tsi/fake_transport_security.c",
    "src/core/lib/tsi/ssl_transport_security.c",
    "src/core/lib/tsi/transport_security.c",
+    "src/core/plugin_registry/grpc_plugin_registry.c",
    "third_party/nanopb/pb_common.c",
    "third_party/nanopb/pb_decode.c",
    "third_party/nanopb/pb_encode.c",
--- a/package.xml
+++ b/package.xml
@ -161,6 +161,8 @@
    <file baseinstalldir="/" name="include/grpc/impl/codegen/propagation_bits.h" role="src" />
    <file baseinstalldir="/" name="include/grpc/impl/codegen/status.h" role="src" />
    <file baseinstalldir="/" name="include/grpc/status.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/alpn.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/bin_encoder.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/chttp2_transport.h" role="src" />
@ -200,9 +202,6 @@
    <file baseinstalldir="/" name="src/core/lib/client_config/client_config.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/connector.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/initial_connect_string.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/load_balancer_api.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/pick_first.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/round_robin.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy_registry.h" role="src" />
@ -262,7 +261,6 @@
    <file baseinstalldir="/" name="src/core/lib/json/json_common.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/json/json_reader.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/json/json_writer.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/auth_filters.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/b64.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials.h" role="src" />
@ -302,6 +300,10 @@
    <file baseinstalldir="/" name="third_party/nanopb/pb_common.h" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_decode.h" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_encode.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/lb_policy/pick_first/pick_first.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/lb_policy/round_robin/round_robin.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2.c" role="src" />
@ -349,9 +351,6 @@
    <file baseinstalldir="/" name="src/core/lib/client_config/connector.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/default_initial_connect_string.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/initial_connect_string.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/load_balancer_api.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/pick_first.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/round_robin.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy_factory.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy_registry.c" role="src" />
@ -417,7 +416,6 @@
    <file baseinstalldir="/" name="src/core/lib/json/json_reader.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/json/json_string.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/json/json_writer.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/b64.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/client_auth_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials.c" role="src" />
@ -463,6 +461,7 @@
    <file baseinstalldir="/" name="src/core/lib/tsi/fake_transport_security.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/tsi/ssl_transport_security.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/tsi/transport_security.c" role="src" />
+    <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.c" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_common.c" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_decode.c" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_encode.c" role="src" />
--- a/src/core/lib/client_config/lb_policies/load_balancer_api.c
+++ b/src/core/lib/client_config/lb_policies/load_balancer_api.c
@ -31,7 +31,7 @@
 *
 */

-#include "src/core/lib/client_config/lb_policies/load_balancer_api.h"
+#include "src/core/ext/lb_policy/grpclb/load_balancer_api.h"
 #include "third_party/nanopb/pb_decode.h"
 #include "third_party/nanopb/pb_encode.h"

--- a/src/core/lib/client_config/lb_policies/load_balancer_api.h
+++ b/src/core/lib/client_config/lb_policies/load_balancer_api.h
@ -31,13 +31,13 @@
 *
 */

-#ifndef GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_LOAD_BALANCER_API_H
-#define GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_LOAD_BALANCER_API_H
+#ifndef GRPC_CORE_EXT_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H
+#define GRPC_CORE_EXT_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H

 #include <grpc/support/slice_buffer.h>

+#include "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h"
 #include "src/core/lib/client_config/lb_policy_factory.h"
-#include "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h"

 #ifdef __cplusplus
 extern "C" {
@ -82,4 +82,4 @@ void grpc_grpclb_response_destroy(grpc_grpclb_response *response);
 }
 #endif

-#endif /* GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_LOAD_BALANCER_API_H */
+#endif /* GRPC_CORE_EXT_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H */
--- a/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
+++ b/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
@ -33,7 +33,7 @@
 /* Automatically generated nanopb constant definitions */
 /* Generated by nanopb-0.3.5-dev */

-#include "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h"
+#include "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h"

 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
--- a/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
+++ b/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
--- a/src/core/lib/client_config/lb_policies/pick_first.c
+++ b/src/core/lib/client_config/lb_policies/pick_first.c
@ -31,12 +31,10 @@
 *
 */

-#include "src/core/lib/client_config/lb_policies/pick_first.h"
-
 #include <string.h>

 #include <grpc/support/alloc.h>
-#include "src/core/lib/client_config/lb_policy_factory.h"
+#include "src/core/lib/client_config/lb_policy_registry.h"
 #include "src/core/lib/transport/connectivity_state.h"

 typedef struct pending_pick {
@ -78,7 +76,7 @@ typedef struct {
 #define GET_SELECTED(p) \
  ((grpc_connected_subchannel *)gpr_atm_acq_load(&(p)->selected))

-void pf_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
+static void pf_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  pick_first_lb_policy *p = (pick_first_lb_policy *)pol;
  grpc_connected_subchannel *selected = GET_SELECTED(p);
  size_t i;
@ -95,7 +93,7 @@ void pf_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  gpr_free(p);
 }

-void pf_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
+static void pf_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  pick_first_lb_policy *p = (pick_first_lb_policy *)pol;
  pending_pick *pp;
  grpc_connected_subchannel *selected;
@ -162,7 +160,7 @@ static void start_picking(grpc_exec_ctx *exec_ctx, pick_first_lb_policy *p) {
      &p->connectivity_changed);
 }

-void pf_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
+static void pf_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  pick_first_lb_policy *p = (pick_first_lb_policy *)pol;
  gpr_mu_lock(&p->mu);
  if (!p->started_picking) {
@ -171,9 +169,10 @@ void pf_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  gpr_mu_unlock(&p->mu);
 }

-int pf_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, grpc_pollset *pollset,
-            grpc_metadata_batch *initial_metadata,
-            grpc_connected_subchannel **target, grpc_closure *on_complete) {
+static int pf_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
+                   grpc_pollset *pollset, grpc_metadata_batch *initial_metadata,
+                   grpc_connected_subchannel **target,
+                   grpc_closure *on_complete) {
  pick_first_lb_policy *p = (pick_first_lb_policy *)pol;
  pending_pick *pp;

@ -356,9 +355,10 @@ static grpc_connectivity_state pf_check_connectivity(grpc_exec_ctx *exec_ctx,
  return st;
 }

-void pf_notify_on_state_change(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
-                               grpc_connectivity_state *current,
-                               grpc_closure *notify) {
+static void pf_notify_on_state_change(grpc_exec_ctx *exec_ctx,
+                                      grpc_lb_policy *pol,
+                                      grpc_connectivity_state *current,
+                                      grpc_closure *notify) {
  pick_first_lb_policy *p = (pick_first_lb_policy *)pol;
  gpr_mu_lock(&p->mu);
  grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker,
@ -366,8 +366,8 @@ void pf_notify_on_state_change(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
  gpr_mu_unlock(&p->mu);
 }

-void pf_ping_one(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
-                 grpc_closure *closure) {
+static void pf_ping_one(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
+                        grpc_closure *closure) {
  pick_first_lb_policy *p = (pick_first_lb_policy *)pol;
  grpc_connected_subchannel *selected = GET_SELECTED(p);
  if (selected) {
@ -439,6 +439,14 @@ static const grpc_lb_policy_factory_vtable pick_first_factory_vtable = {
 static grpc_lb_policy_factory pick_first_lb_policy_factory = {
    &pick_first_factory_vtable};

-grpc_lb_policy_factory *grpc_pick_first_lb_factory_create() {
+static grpc_lb_policy_factory *pick_first_lb_factory_create() {
  return &pick_first_lb_policy_factory;
 }
+
+/* Plugin registration */
+
+void grpc_lb_policy_pick_first_init() {
+  grpc_register_lb_policy(pick_first_lb_factory_create());
+}
+
+void grpc_lb_policy_pick_first_shutdown() {}
--- a/src/core/lib/client_config/lb_policies/round_robin.c
+++ b/src/core/lib/client_config/lb_policies/round_robin.c
@ -31,11 +31,12 @@
 *
 */

-#include "src/core/lib/client_config/lb_policies/round_robin.h"
-
 #include <string.h>

 #include <grpc/support/alloc.h>
+
+#include "src/core/lib/client_config/lb_policy_registry.h"
+#include "src/core/lib/debug/trace.h"
 #include "src/core/lib/transport/connectivity_state.h"

 typedef struct round_robin_lb_policy round_robin_lb_policy;
@ -199,7 +200,7 @@ static void remove_disconnected_sc_locked(round_robin_lb_policy *p,
  gpr_free(node);
 }

-void rr_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
+static void rr_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  round_robin_lb_policy *p = (round_robin_lb_policy *)pol;
  size_t i;
  ready_list *elem;
@ -226,7 +227,7 @@ void rr_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  gpr_free(p);
 }

-void rr_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
+static void rr_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  round_robin_lb_policy *p = (round_robin_lb_policy *)pol;
  pending_pick *pp;
  size_t i;
@ -291,7 +292,7 @@ static void start_picking(grpc_exec_ctx *exec_ctx, round_robin_lb_policy *p) {
  }
 }

-void rr_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
+static void rr_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  round_robin_lb_policy *p = (round_robin_lb_policy *)pol;
  gpr_mu_lock(&p->mu);
  if (!p->started_picking) {
@ -300,9 +301,10 @@ void rr_exit_idle(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
  gpr_mu_unlock(&p->mu);
 }

-int rr_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, grpc_pollset *pollset,
-            grpc_metadata_batch *initial_metadata,
-            grpc_connected_subchannel **target, grpc_closure *on_complete) {
+static int rr_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
+                   grpc_pollset *pollset, grpc_metadata_batch *initial_metadata,
+                   grpc_connected_subchannel **target,
+                   grpc_closure *on_complete) {
  round_robin_lb_policy *p = (round_robin_lb_policy *)pol;
  pending_pick *pp;
  ready_list *selected;
@ -558,6 +560,15 @@ static const grpc_lb_policy_factory_vtable round_robin_factory_vtable = {
 static grpc_lb_policy_factory round_robin_lb_policy_factory = {
    &round_robin_factory_vtable};

-grpc_lb_policy_factory *grpc_round_robin_lb_factory_create() {
+static grpc_lb_policy_factory *round_robin_lb_factory_create() {
  return &round_robin_lb_policy_factory;
 }
+
+/* Plugin registration */
+
+void grpc_lb_policy_round_robin_init() {
+  grpc_register_lb_policy(round_robin_lb_factory_create());
+  grpc_register_tracer("round_robin", &grpc_lb_round_robin_trace);
+}
+
+void grpc_lb_policy_round_robin_shutdown() {}
--- a/src/core/lib/client_config/lb_policy_registry.c
+++ b/src/core/lib/client_config/lb_policy_registry.c
@ -40,12 +40,7 @@
 static grpc_lb_policy_factory *g_all_of_the_lb_policies[MAX_POLICIES];
 static int g_number_of_lb_policies = 0;

-static grpc_lb_policy_factory *g_default_lb_policy_factory;
-
-void grpc_lb_policy_registry_init(grpc_lb_policy_factory *default_factory) {
-  g_number_of_lb_policies = 0;
-  g_default_lb_policy_factory = default_factory;
-}
+void grpc_lb_policy_registry_init(void) { g_number_of_lb_policies = 0; }

 void grpc_lb_policy_registry_shutdown(void) {
  int i;
--- a/src/core/lib/client_config/lb_policy_registry.h
+++ b/src/core/lib/client_config/lb_policy_registry.h
@ -39,7 +39,7 @@

 /** Initialize the registry and set \a default_factory as the factory to be
 * returned when no name is provided in a lookup */
-void grpc_lb_policy_registry_init(grpc_lb_policy_factory *default_factory);
+void grpc_lb_policy_registry_init(void);
 void grpc_lb_policy_registry_shutdown(void);

 /** Register a LB policy factory. */
--- a/src/core/lib/surface/init.c
+++ b/src/core/lib/surface/init.c
@ -48,8 +48,6 @@
 #include "src/core/lib/channel/connected_channel.h"
 #include "src/core/lib/channel/http_client_filter.h"
 #include "src/core/lib/channel/http_server_filter.h"
-#include "src/core/lib/client_config/lb_policies/pick_first.h"
-#include "src/core/lib/client_config/lb_policies/round_robin.h"
 #include "src/core/lib/client_config/lb_policy_registry.h"
 #include "src/core/lib/client_config/resolver_registry.h"
 #include "src/core/lib/client_config/resolvers/dns_resolver.h"
@ -75,6 +73,9 @@
 #define GRPC_DEFAULT_NAME_PREFIX "dns:///"
 #endif

+/* (generated) built in registry of plugins */
+extern void grpc_register_built_in_plugins(void);
+
 #define MAX_PLUGINS 128

 static gpr_once g_basic_init = GPR_ONCE_INIT;
@ -83,6 +84,7 @@ static int g_initializations;

 static void do_basic_init(void) {
  gpr_mu_init(&g_init_mu);
+  grpc_register_built_in_plugins();
  /* TODO(ctiller): ideally remove this strict linkage */
  grpc_register_plugin(census_grpc_plugin_init, census_grpc_plugin_destroy);
  g_initializations = 0;
@ -165,9 +167,7 @@ void grpc_init(void) {
    gpr_time_init();
    grpc_mdctx_global_init();
    grpc_channel_init_init();
-    grpc_lb_policy_registry_init(grpc_pick_first_lb_factory_create());
-    grpc_register_lb_policy(grpc_pick_first_lb_factory_create());
-    grpc_register_lb_policy(grpc_round_robin_lb_factory_create());
+    grpc_lb_policy_registry_init();
    grpc_resolver_registry_init(GRPC_DEFAULT_NAME_PREFIX);
    grpc_register_resolver_type(grpc_dns_resolver_factory_create());
    grpc_register_resolver_type(grpc_ipv4_resolver_factory_create());
--- a/src/core/lib/client_config/lb_policies/pick_first.h
+++ b/src/core/lib/client_config/lb_policies/pick_first.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -31,13 +31,16 @@
 *
 */

-#ifndef GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_PICK_FIRST_H
-#define GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_PICK_FIRST_H
+#include <grpc/grpc.h>

-#include "src/core/lib/client_config/lb_policy_factory.h"
+extern void grpc_lb_policy_pick_first_init(void);
+extern void grpc_lb_policy_pick_first_shutdown(void);
+extern void grpc_lb_policy_round_robin_init(void);
+extern void grpc_lb_policy_round_robin_shutdown(void);

-/** Returns a load balancing factory for the pick first policy, which picks up
- * the first subchannel from \a subchannels to succesfully connect */
-grpc_lb_policy_factory *grpc_pick_first_lb_factory_create();
-
-#endif /* GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_PICK_FIRST_H */
+void grpc_register_built_in_plugins(void) {
+  grpc_register_plugin(grpc_lb_policy_pick_first_init,
+                       grpc_lb_policy_pick_first_shutdown);
+  grpc_register_plugin(grpc_lb_policy_round_robin_init,
+                       grpc_lb_policy_round_robin_shutdown);
+}
--- a/src/core/plugin_registry/grpc_unsecure_plugin_registry.c
+++ b/src/core/plugin_registry/grpc_unsecure_plugin_registry.c
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -31,16 +31,16 @@
 *
 */

-#ifndef GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_ROUND_ROBIN_H
-#define GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_ROUND_ROBIN_H
+#include <grpc/grpc.h>

-#include "src/core/lib/client_config/lb_policy.h"
+extern void grpc_lb_policy_pick_first_init(void);
+extern void grpc_lb_policy_pick_first_shutdown(void);
+extern void grpc_lb_policy_round_robin_init(void);
+extern void grpc_lb_policy_round_robin_shutdown(void);

-extern int grpc_lb_round_robin_trace;
-
-#include "src/core/lib/client_config/lb_policy_factory.h"
-
-/** Returns a load balancing factory for the round robin policy */
-grpc_lb_policy_factory *grpc_round_robin_lb_factory_create();
-
-#endif /* GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICIES_ROUND_ROBIN_H */
+void grpc_register_built_in_plugins(void) {
+  grpc_register_plugin(grpc_lb_policy_pick_first_init,
+                       grpc_lb_policy_pick_first_shutdown);
+  grpc_register_plugin(grpc_lb_policy_round_robin_init,
+                       grpc_lb_policy_round_robin_shutdown);
+}
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -74,6 +74,10 @@ CORE_SOURCE_FILES = [
  'src/core/lib/support/tmpfile_posix.c',
  'src/core/lib/support/tmpfile_win32.c',
  'src/core/lib/support/wrap_memcpy.c',
+  'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
+  'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
+  'src/core/ext/lb_policy/pick_first/pick_first.c',
+  'src/core/ext/lb_policy/round_robin/round_robin.c',
  'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
  'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
  'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
@ -121,9 +125,6 @@ CORE_SOURCE_FILES = [
  'src/core/lib/client_config/connector.c',
  'src/core/lib/client_config/default_initial_connect_string.c',
  'src/core/lib/client_config/initial_connect_string.c',
-  'src/core/lib/client_config/lb_policies/load_balancer_api.c',
-  'src/core/lib/client_config/lb_policies/pick_first.c',
-  'src/core/lib/client_config/lb_policies/round_robin.c',
  'src/core/lib/client_config/lb_policy.c',
  'src/core/lib/client_config/lb_policy_factory.c',
  'src/core/lib/client_config/lb_policy_registry.c',
@ -189,7 +190,6 @@ CORE_SOURCE_FILES = [
  'src/core/lib/json/json_reader.c',
  'src/core/lib/json/json_string.c',
  'src/core/lib/json/json_writer.c',
-  'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/lib/security/b64.c',
  'src/core/lib/security/client_auth_filter.c',
  'src/core/lib/security/credentials.c',
@ -235,6 +235,7 @@ CORE_SOURCE_FILES = [
  'src/core/lib/tsi/fake_transport_security.c',
  'src/core/lib/tsi/ssl_transport_security.c',
  'src/core/lib/tsi/transport_security.c',
+  'src/core/plugin_registry/grpc_plugin_registry.c',
  'third_party/nanopb/pb_common.c',
  'third_party/nanopb/pb_decode.c',
  'third_party/nanopb/pb_encode.c',
--- a/templates/src/core/plugin_registry.template
+++ b/templates/src/core/plugin_registry.template
@ -0,0 +1,52 @@
+%YAML 1.2
+---
+foreach: libs
+cond: selected.get('generate_plugin_registry', False)
+output_name: ${selected.name}_plugin_registry.c
+template: |
+  /*
+   *
+   * Copyright 2016, Google Inc.
+   * All rights reserved.
+   *
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are
+   * met:
+   *
+   *     * Redistributions of source code must retain the above copyright
+   * notice, this list of conditions and the following disclaimer.
+   *     * Redistributions in binary form must reproduce the above
+   * copyright notice, this list of conditions and the following disclaimer
+   * in the documentation and/or other materials provided with the
+   * distribution.
+   *     * Neither the name of Google Inc. nor the names of its
+   * contributors may be used to endorse or promote products derived from
+   * this software without specific prior written permission.
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+   * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+   * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   *
+   */
+
+  #include <grpc/grpc.h>
+
+  %for plugin in selected.plugins:
+  extern void ${plugin}_init(void);
+  extern void ${plugin}_shutdown(void);
+  %endfor
+
+  void grpc_register_built_in_plugins(void) {
+  %for plugin in selected.plugins:
+    grpc_register_plugin(${plugin}_init,
+                         ${plugin}_shutdown);
+  %endfor
+  }
--- a/test/core/client_config/lb_policies_test.c
+++ b/test/core/client_config/lb_policies_test.c
@ -43,7 +43,6 @@

 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/client_channel.h"
-#include "src/core/lib/client_config/lb_policies/round_robin.h"
 #include "src/core/lib/client_config/lb_policy_registry.h"
 #include "src/core/lib/support/string.h"
 #include "src/core/lib/surface/channel.h"
@ -881,7 +880,7 @@ int main(int argc, char **argv) {

  grpc_test_init(argc, argv);
  grpc_init();
-  grpc_lb_round_robin_trace = 1;
+  grpc_tracer_set_enabled("round_robin", 1);

  GPR_ASSERT(grpc_lb_policy_create(&exec_ctx, "this-lb-policy-does-not-exist",
                                   NULL) == NULL);
--- a/test/cpp/grpclb/grpclb_api_test.cc
+++ b/test/cpp/grpclb/grpclb_api_test.cc
@ -34,7 +34,7 @@
 #include <gtest/gtest.h>
 #include <string>

-#include "src/core/lib/client_config/lb_policies/load_balancer_api.h"
+#include "src/core/ext/lb_policy/grpclb/load_balancer_api.h"
 #include "src/proto/grpc/lb/v0/load_balancer.pb.h"  // C++ version

 namespace grpc {
--- a/tools/buildgen/plugins/expand_filegroups.py
+++ b/tools/buildgen/plugins/expand_filegroups.py
@ -75,11 +75,20 @@ def mako_plugin(dictionary):
      todo.append(cur)
    else:
      skips = 0
+      assert 'plugins' not in cur
+      plugins = []
      for uses in cur.get('uses', []):
+        for plugin in filegroups[uses]['plugins']:
+          if plugin not in plugins:
+            plugins.append(plugin)
        for lst in FILEGROUP_LISTS:
          vals = cur.get(lst, [])
          vals.extend(filegroups[uses].get(lst, []))
          cur[lst] = vals
+      cur_plugin_name = cur.get('plugin')
+      if cur_plugin_name:
+        plugins.append(cur_plugin_name)
+      cur['plugins'] = plugins
      filegroups[cur['name']] = cur

  # the above expansion can introduce duplicate filenames: contract them here
@ -88,13 +97,20 @@ def mako_plugin(dictionary):
      fg[lst] = sorted(list(set(fg.get(lst, []))))

  for lib in libs:
+    assert 'plugins' not in lib
+    plugins = []
    for fg_name in lib.get('filegroups', []):
      fg = filegroups[fg_name]
-
+      for plugin in fg['plugins']:
+        if plugin not in plugins:
+          plugins.append(plugin)
      for lst in FILEGROUP_LISTS:
        vals = lib.get(lst, [])
        vals.extend(fg.get(lst, []))
        lib[lst] = vals
-
+      lib['plugins'] = plugins
+    if lib.get('generate_plugin_registry', False):
+      lib['src'].append('src/core/plugin_registry/%s_plugin_registry.c' %
+                        lib['name'])
    for lst in FILEGROUP_LISTS:
      lib[lst] = sorted(list(set(lib.get(lst, []))))
--- a/tools/codegen/core/gen_load_balancing_proto.sh
+++ b/tools/codegen/core/gen_load_balancing_proto.sh
@ -82,7 +82,7 @@ fi

 readonly GRPC_ROOT=$PWD

-OUTPUT_DIR="$GRPC_ROOT/src/core/lib/proto/grpc/lb/v0"
+OUTPUT_DIR="$GRPC_ROOT/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0"
 if [ $# -eq 2 ]; then
  mkdir -p "$2"
  if [ $? != 0 ]; then
@ -122,7 +122,7 @@ protoc \
 "$(basename $1)"

 readonly PROTO_BASENAME=$(basename $1 .proto)
-sed -i "s:$PROTO_BASENAME.pb.h:src/core/lib/proto/grpc/lb/v0/$PROTO_BASENAME.pb.h:g" \
+sed -i "s:$PROTO_BASENAME.pb.h:src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/$PROTO_BASENAME.pb.h:g" \
    "$OUTPUT_DIR/$PROTO_BASENAME.pb.c"

 # prepend copyright
--- a/tools/distrib/check_include_guards.py
+++ b/tools/distrib/check_include_guards.py
@ -167,7 +167,7 @@ argp.add_argument('--precommit',
 args = argp.parse_args()

 KNOWN_BAD = set([
-    'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h',
+    'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
 ])


--- a/tools/distrib/check_nanopb_output.sh
+++ b/tools/distrib/check_nanopb_output.sh
@ -60,7 +60,7 @@ PATH="$PROTOC_PATH:$PATH" ./tools/codegen/core/gen_load_balancing_proto.sh \
  $NANOPB_TMP_OUTPUT

 # compare outputs to checked compiled code
-if ! diff -r $NANOPB_TMP_OUTPUT src/core/lib/proto/grpc/lb/v0; then
-  echo "Outputs differ: $NANOPB_TMP_OUTPUT vs src/core/lib/proto/grpc/lb/v0"
+if ! diff -r $NANOPB_TMP_OUTPUT src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0; then
+  echo "Outputs differ: $NANOPB_TMP_OUTPUT vs src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0"
  exit 2
 fi
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -773,6 +773,8 @@ include/grpc/impl/codegen/grpc_types.h \
 include/grpc/impl/codegen/propagation_bits.h \
 include/grpc/impl/codegen/status.h \
 include/grpc/status.h \
+src/core/ext/lb_policy/grpclb/load_balancer_api.h \
+src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \
 src/core/ext/transport/chttp2/transport/alpn.h \
 src/core/ext/transport/chttp2/transport/bin_encoder.h \
 src/core/ext/transport/chttp2/transport/chttp2_transport.h \
@ -812,9 +814,6 @@ src/core/lib/channel/subchannel_call_holder.h \
 src/core/lib/client_config/client_config.h \
 src/core/lib/client_config/connector.h \
 src/core/lib/client_config/initial_connect_string.h \
-src/core/lib/client_config/lb_policies/load_balancer_api.h \
-src/core/lib/client_config/lb_policies/pick_first.h \
-src/core/lib/client_config/lb_policies/round_robin.h \
 src/core/lib/client_config/lb_policy.h \
 src/core/lib/client_config/lb_policy_factory.h \
 src/core/lib/client_config/lb_policy_registry.h \
@ -874,7 +873,6 @@ src/core/lib/json/json.h \
 src/core/lib/json/json_common.h \
 src/core/lib/json/json_reader.h \
 src/core/lib/json/json_writer.h \
-src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h \
 src/core/lib/security/auth_filters.h \
 src/core/lib/security/b64.h \
 src/core/lib/security/credentials.h \
@ -914,6 +912,10 @@ third_party/nanopb/pb.h \
 third_party/nanopb/pb_common.h \
 third_party/nanopb/pb_decode.h \
 third_party/nanopb/pb_encode.h \
+src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
+src/core/ext/lb_policy/pick_first/pick_first.c \
+src/core/ext/lb_policy/round_robin/round_robin.c \
 src/core/ext/transport/chttp2/client/insecure/channel_create.c \
 src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \
 src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
@ -961,9 +963,6 @@ src/core/lib/client_config/client_config.c \
 src/core/lib/client_config/connector.c \
 src/core/lib/client_config/default_initial_connect_string.c \
 src/core/lib/client_config/initial_connect_string.c \
-src/core/lib/client_config/lb_policies/load_balancer_api.c \
-src/core/lib/client_config/lb_policies/pick_first.c \
-src/core/lib/client_config/lb_policies/round_robin.c \
 src/core/lib/client_config/lb_policy.c \
 src/core/lib/client_config/lb_policy_factory.c \
 src/core/lib/client_config/lb_policy_registry.c \
@ -1029,7 +1028,6 @@ src/core/lib/json/json.c \
 src/core/lib/json/json_reader.c \
 src/core/lib/json/json_string.c \
 src/core/lib/json/json_writer.c \
-src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c \
 src/core/lib/security/b64.c \
 src/core/lib/security/client_auth_filter.c \
 src/core/lib/security/credentials.c \
@ -1075,6 +1073,7 @@ src/core/lib/transport/transport_op_string.c \
 src/core/lib/tsi/fake_transport_security.c \
 src/core/lib/tsi/ssl_transport_security.c \
 src/core/lib/tsi/transport_security.c \
+src/core/plugin_registry/grpc_plugin_registry.c \
 third_party/nanopb/pb_common.c \
 third_party/nanopb/pb_decode.c \
 third_party/nanopb/pb_encode.c \
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -4036,6 +4036,8 @@
      "include/grpc/impl/codegen/propagation_bits.h", 
      "include/grpc/impl/codegen/status.h", 
      "include/grpc/status.h", 
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.h", 
+      "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", 
      "src/core/ext/transport/chttp2/transport/alpn.h", 
      "src/core/ext/transport/chttp2/transport/bin_encoder.h", 
      "src/core/ext/transport/chttp2/transport/chttp2_transport.h", 
@ -4075,9 +4077,6 @@
      "src/core/lib/client_config/client_config.h", 
      "src/core/lib/client_config/connector.h", 
      "src/core/lib/client_config/initial_connect_string.h", 
-      "src/core/lib/client_config/lb_policies/load_balancer_api.h", 
-      "src/core/lib/client_config/lb_policies/pick_first.h", 
-      "src/core/lib/client_config/lb_policies/round_robin.h", 
      "src/core/lib/client_config/lb_policy.h", 
      "src/core/lib/client_config/lb_policy_factory.h", 
      "src/core/lib/client_config/lb_policy_registry.h", 
@ -4137,7 +4136,6 @@
      "src/core/lib/json/json_common.h", 
      "src/core/lib/json/json_reader.h", 
      "src/core/lib/json/json_writer.h", 
-      "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h", 
      "src/core/lib/security/auth_filters.h", 
      "src/core/lib/security/b64.h", 
      "src/core/lib/security/credentials.h", 
@ -4194,6 +4192,12 @@
      "include/grpc/impl/codegen/propagation_bits.h", 
      "include/grpc/impl/codegen/status.h", 
      "include/grpc/status.h", 
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.c", 
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.h", 
+      "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", 
+      "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", 
+      "src/core/ext/lb_policy/pick_first/pick_first.c", 
+      "src/core/ext/lb_policy/round_robin/round_robin.c", 
      "src/core/ext/transport/chttp2/client/insecure/channel_create.c", 
      "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c", 
      "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", 
@ -4280,12 +4284,6 @@
      "src/core/lib/client_config/default_initial_connect_string.c", 
      "src/core/lib/client_config/initial_connect_string.c", 
      "src/core/lib/client_config/initial_connect_string.h", 
-      "src/core/lib/client_config/lb_policies/load_balancer_api.c", 
-      "src/core/lib/client_config/lb_policies/load_balancer_api.h", 
-      "src/core/lib/client_config/lb_policies/pick_first.c", 
-      "src/core/lib/client_config/lb_policies/pick_first.h", 
-      "src/core/lib/client_config/lb_policies/round_robin.c", 
-      "src/core/lib/client_config/lb_policies/round_robin.h", 
      "src/core/lib/client_config/lb_policy.c", 
      "src/core/lib/client_config/lb_policy.h", 
      "src/core/lib/client_config/lb_policy_factory.c", 
@ -4410,8 +4408,6 @@
      "src/core/lib/json/json_string.c", 
      "src/core/lib/json/json_writer.c", 
      "src/core/lib/json/json_writer.h", 
-      "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c", 
-      "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h", 
      "src/core/lib/security/auth_filters.h", 
      "src/core/lib/security/b64.c", 
      "src/core/lib/security/b64.h", 
@ -4491,7 +4487,8 @@
      "src/core/lib/tsi/ssl_types.h", 
      "src/core/lib/tsi/transport_security.c", 
      "src/core/lib/tsi/transport_security.h", 
-      "src/core/lib/tsi/transport_security_interface.h"
+      "src/core/lib/tsi/transport_security_interface.h", 
+      "src/core/plugin_registry/grpc_plugin_registry.c"
    ], 
    "third_party": false, 
    "type": "lib"
@ -4664,6 +4661,8 @@
      "include/grpc/impl/codegen/propagation_bits.h", 
      "include/grpc/impl/codegen/status.h", 
      "include/grpc/status.h", 
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.h", 
+      "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", 
      "src/core/ext/transport/chttp2/transport/alpn.h", 
      "src/core/ext/transport/chttp2/transport/bin_encoder.h", 
      "src/core/ext/transport/chttp2/transport/chttp2_transport.h", 
@ -4703,9 +4702,6 @@
      "src/core/lib/client_config/client_config.h", 
      "src/core/lib/client_config/connector.h", 
      "src/core/lib/client_config/initial_connect_string.h", 
-      "src/core/lib/client_config/lb_policies/load_balancer_api.h", 
-      "src/core/lib/client_config/lb_policies/pick_first.h", 
-      "src/core/lib/client_config/lb_policies/round_robin.h", 
      "src/core/lib/client_config/lb_policy.h", 
      "src/core/lib/client_config/lb_policy_factory.h", 
      "src/core/lib/client_config/lb_policy_registry.h", 
@ -4765,7 +4761,6 @@
      "src/core/lib/json/json_common.h", 
      "src/core/lib/json/json_reader.h", 
      "src/core/lib/json/json_writer.h", 
-      "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h", 
      "src/core/lib/statistics/census_interface.h", 
      "src/core/lib/statistics/census_rpc_stats.h", 
      "src/core/lib/surface/api_trace.h", 
@ -4807,6 +4802,12 @@
      "include/grpc/impl/codegen/propagation_bits.h", 
      "include/grpc/impl/codegen/status.h", 
      "include/grpc/status.h", 
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.c", 
+      "src/core/ext/lb_policy/grpclb/load_balancer_api.h", 
+      "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", 
+      "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", 
+      "src/core/ext/lb_policy/pick_first/pick_first.c", 
+      "src/core/ext/lb_policy/round_robin/round_robin.c", 
      "src/core/ext/transport/chttp2/client/insecure/channel_create.c", 
      "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c", 
      "src/core/ext/transport/chttp2/transport/alpn.c", 
@ -4891,12 +4892,6 @@
      "src/core/lib/client_config/default_initial_connect_string.c", 
      "src/core/lib/client_config/initial_connect_string.c", 
      "src/core/lib/client_config/initial_connect_string.h", 
-      "src/core/lib/client_config/lb_policies/load_balancer_api.c", 
-      "src/core/lib/client_config/lb_policies/load_balancer_api.h", 
-      "src/core/lib/client_config/lb_policies/pick_first.c", 
-      "src/core/lib/client_config/lb_policies/pick_first.h", 
-      "src/core/lib/client_config/lb_policies/round_robin.c", 
-      "src/core/lib/client_config/lb_policies/round_robin.h", 
      "src/core/lib/client_config/lb_policy.c", 
      "src/core/lib/client_config/lb_policy.h", 
      "src/core/lib/client_config/lb_policy_factory.c", 
@ -5020,8 +5015,6 @@
      "src/core/lib/json/json_string.c", 
      "src/core/lib/json/json_writer.c", 
      "src/core/lib/json/json_writer.h", 
-      "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c", 
-      "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h", 
      "src/core/lib/statistics/census_interface.h", 
      "src/core/lib/statistics/census_rpc_stats.h", 
      "src/core/lib/surface/alarm.c", 
@ -5070,7 +5063,8 @@
      "src/core/lib/transport/transport.c", 
      "src/core/lib/transport/transport.h", 
      "src/core/lib/transport/transport_impl.h", 
-      "src/core/lib/transport/transport_op_string.c"
+      "src/core/lib/transport/transport_op_string.c", 
+      "src/core/plugin_registry/grpc_unsecure_plugin_registry.c"
    ], 
    "third_party": false, 
    "type": "lib"
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@ -282,6 +282,8 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc\status.h" />
  </ItemGroup>
  <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h" />
@ -321,9 +323,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\connector.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\load_balancer_api.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\pick_first.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\round_robin.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy_registry.h" />
@ -383,7 +382,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_common.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_reader.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_writer.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\proto\grpc\lb\v0\load_balancer.pb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\auth_filters.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\b64.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials.h" />
@ -425,6 +423,14 @@
    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h" />
  </ItemGroup>
  <ItemGroup>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\round_robin\round_robin.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\secure\secure_channel_create.c">
@ -519,12 +525,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\load_balancer_api.c">
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\pick_first.c">
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\round_robin.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy_factory.c">
@ -655,8 +655,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\proto\grpc\lb\v0\load_balancer.pb.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\b64.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\client_auth_filter.c">
@ -747,6 +745,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\plugin_registry\grpc_plugin_registry.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.c">
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
+      <Filter>src\core\ext\lb_policy\grpclb</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
+      <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
+      <Filter>src\core\ext\lb_policy\pick_first</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\round_robin\round_robin.c">
+      <Filter>src\core\ext\lb_policy\round_robin</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c">
      <Filter>src\core\ext\transport\chttp2\client\insecure</Filter>
    </ClCompile>
@ -142,15 +154,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\load_balancer_api.c">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\pick_first.c">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\round_robin.c">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
@ -346,9 +349,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
      <Filter>src\core\lib\json</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\proto\grpc\lb\v0\load_balancer.pb.c">
-      <Filter>src\core\lib\proto\grpc\lb\v0</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\b64.c">
      <Filter>src\core\lib\security</Filter>
    </ClCompile>
@ -484,6 +484,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.c">
      <Filter>src\core\lib\tsi</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\plugin_registry\grpc_plugin_registry.c">
+      <Filter>src\core\plugin_registry</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c">
      <Filter>third_party\nanopb</Filter>
    </ClCompile>
@ -536,6 +539,12 @@
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h">
+      <Filter>src\core\ext\lb_policy\grpclb</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h">
+      <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h">
      <Filter>src\core\ext\transport\chttp2\transport</Filter>
    </ClInclude>
@ -653,15 +662,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\load_balancer_api.h">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\pick_first.h">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\round_robin.h">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
@ -839,9 +839,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_writer.h">
      <Filter>src\core\lib\json</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\proto\grpc\lb\v0\load_balancer.pb.h">
-      <Filter>src\core\lib\proto\grpc\lb\v0</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\auth_filters.h">
      <Filter>src\core\lib\security</Filter>
    </ClInclude>
@ -983,6 +980,30 @@
    <Filter Include="src\core\ext">
      <UniqueIdentifier>{3f32a58f-394f-5f13-06aa-6cc52cc2daaf}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\core\ext\lb_policy">
+      <UniqueIdentifier>{030f00ff-6c54-76c8-12df-37e3008335d1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb">
+      <UniqueIdentifier>{fe41339e-53fb-39b3-7457-7a0fbb238dbe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb\proto">
+      <UniqueIdentifier>{a7c27f6b-6d15-01cf-76d9-c30dddea0990}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb\proto\grpc">
+      <UniqueIdentifier>{bc714e6d-8aba-91df-7db9-7f189f05a6ff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb\proto\grpc\lb">
+      <UniqueIdentifier>{adf7e553-94ef-14fd-e845-03104f00a06f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0">
+      <UniqueIdentifier>{0406d191-8817-38c3-a562-e3541201f424}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\pick_first">
+      <UniqueIdentifier>{b63ded00-b24f-708e-333f-ce199e421875}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\round_robin">
+      <UniqueIdentifier>{2472d352-cf94-f317-646e-72b769cea846}</UniqueIdentifier>
+    </Filter>
    <Filter Include="src\core\ext\transport">
      <UniqueIdentifier>{e3abfd0a-064e-0f2f-c8e8-7c5a7e98142a}</UniqueIdentifier>
    </Filter>
@ -1022,9 +1043,6 @@
    <Filter Include="src\core\lib\client_config">
      <UniqueIdentifier>{2f3260de-be57-d18d-6882-61d115baa159}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\lib\client_config\lb_policies">
-      <UniqueIdentifier>{118d2bb5-086f-54f3-11de-26d7d7f73f9d}</UniqueIdentifier>
-    </Filter>
    <Filter Include="src\core\lib\client_config\resolvers">
      <UniqueIdentifier>{b9d8db6c-2c68-1c90-fe5e-37da90f47ae6}</UniqueIdentifier>
    </Filter>
@ -1043,18 +1061,6 @@
    <Filter Include="src\core\lib\json">
      <UniqueIdentifier>{cb2b0073-f2a7-5c63-d182-8874b24bdf36}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\lib\proto">
-      <UniqueIdentifier>{b4b19f9a-1575-8a21-0bca-537746f858b7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\lib\proto\grpc">
-      <UniqueIdentifier>{cbc8ce67-4a97-d533-8dc3-f949c63e2771}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\lib\proto\grpc\lb">
-      <UniqueIdentifier>{933530ae-447b-ea8d-3531-98f0556960b0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\lib\proto\grpc\lb\v0">
-      <UniqueIdentifier>{c33f944f-37d4-42fd-abc3-61f0d4400462}</UniqueIdentifier>
-    </Filter>
    <Filter Include="src\core\lib\security">
      <UniqueIdentifier>{c4661d64-349f-01c1-1ba8-0602f9047595}</UniqueIdentifier>
    </Filter>
@ -1070,6 +1076,9 @@
    <Filter Include="src\core\lib\tsi">
      <UniqueIdentifier>{95ad2811-c8d0-7a42-2a73-baf03fcbf699}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\core\plugin_registry">
+      <UniqueIdentifier>{02bec99b-ff39-88d7-9dea-e0ff9f4a2701}</UniqueIdentifier>
+    </Filter>
    <Filter Include="third_party">
      <UniqueIdentifier>{aaab30a4-2a15-732e-c141-3fbc0f0f5a7a}</UniqueIdentifier>
    </Filter>
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@ -272,6 +272,8 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc\status.h" />
  </ItemGroup>
  <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h" />
@ -311,9 +313,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\client_config.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\connector.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\load_balancer_api.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\pick_first.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\round_robin.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy_registry.h" />
@ -373,7 +372,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_common.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_reader.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_writer.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\proto\grpc\lb\v0\load_balancer.pb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\statistics\census_interface.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\statistics\census_rpc_stats.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\api_trace.h" />
@ -401,6 +399,14 @@
    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h" />
  </ItemGroup>
  <ItemGroup>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\round_robin\round_robin.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c">
@ -491,12 +497,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\load_balancer_api.c">
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\pick_first.c">
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\round_robin.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy_factory.c">
@ -625,8 +625,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\proto\grpc\lb\v0\load_balancer.pb.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\alarm.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\api_trace.c">
@ -683,6 +681,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\transport_op_string.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\plugin_registry\grpc_unsecure_plugin_registry.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.c">
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
+      <Filter>src\core\ext\lb_policy\grpclb</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
+      <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
+      <Filter>src\core\ext\lb_policy\pick_first</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\round_robin\round_robin.c">
+      <Filter>src\core\ext\lb_policy\round_robin</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c">
      <Filter>src\core\ext\transport\chttp2\client\insecure</Filter>
    </ClCompile>
@ -136,15 +148,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\load_balancer_api.c">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\pick_first.c">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\round_robin.c">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy.c">
      <Filter>src\core\lib\client_config</Filter>
    </ClCompile>
@ -337,9 +340,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
      <Filter>src\core\lib\json</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\proto\grpc\lb\v0\load_balancer.pb.c">
-      <Filter>src\core\lib\proto\grpc\lb\v0</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\alarm.c">
      <Filter>src\core\lib\surface</Filter>
    </ClCompile>
@ -424,6 +424,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\transport_op_string.c">
      <Filter>src\core\lib\transport</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\plugin_registry\grpc_unsecure_plugin_registry.c">
+      <Filter>src\core\plugin_registry</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c">
      <Filter>third_party\nanopb</Filter>
    </ClCompile>
@ -473,6 +476,12 @@
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h">
+      <Filter>src\core\ext\lb_policy\grpclb</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h">
+      <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h">
      <Filter>src\core\ext\transport\chttp2\transport</Filter>
    </ClInclude>
@ -590,15 +599,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\initial_connect_string.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\load_balancer_api.h">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\pick_first.h">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policies\round_robin.h">
-      <Filter>src\core\lib\client_config\lb_policies</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\client_config\lb_policy.h">
      <Filter>src\core\lib\client_config</Filter>
    </ClInclude>
@ -776,9 +776,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_writer.h">
      <Filter>src\core\lib\json</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\proto\grpc\lb\v0\load_balancer.pb.h">
-      <Filter>src\core\lib\proto\grpc\lb\v0</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\statistics\census_interface.h">
      <Filter>src\core\lib\statistics</Filter>
    </ClInclude>
@ -878,6 +875,30 @@
    <Filter Include="src\core\ext">
      <UniqueIdentifier>{82f86e8c-00a4-f566-d235-670fc629798d}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\core\ext\lb_policy">
+      <UniqueIdentifier>{a23781d2-27e4-7cb0-12cd-59782ecb21ce}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb">
+      <UniqueIdentifier>{25a465c8-d1e8-6248-c005-bb2062206472}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb\proto">
+      <UniqueIdentifier>{40fc2615-d244-0d36-4486-ba6f0fa468bb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb\proto\grpc">
+      <UniqueIdentifier>{1d129f24-a399-12ef-68de-023aff7dde52}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb\proto\grpc\lb">
+      <UniqueIdentifier>{21858d9d-30b5-8847-5882-6b47df0fa293}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0">
+      <UniqueIdentifier>{1795a20b-3e7c-e27d-eae1-96582fa9a958}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\pick_first">
+      <UniqueIdentifier>{e27f9ecf-97bb-1a2e-3135-a41f732dcf55}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\core\ext\lb_policy\round_robin">
+      <UniqueIdentifier>{e5fc1091-5d60-404f-775b-686ef4b3266f}</UniqueIdentifier>
+    </Filter>
    <Filter Include="src\core\ext\transport">
      <UniqueIdentifier>{967c89fe-c97c-27e2-aac0-9ba5854cb5fa}</UniqueIdentifier>
    </Filter>
@ -911,9 +932,6 @@
    <Filter Include="src\core\lib\client_config">
      <UniqueIdentifier>{29ca2974-89e4-1a74-3e4d-0d63e2f77566}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\lib\client_config\lb_policies">
-      <UniqueIdentifier>{6c7e36d4-6117-e0cd-c886-b9eb3c994927}</UniqueIdentifier>
-    </Filter>
    <Filter Include="src\core\lib\client_config\resolvers">
      <UniqueIdentifier>{2d959ef9-9703-dc92-a56f-9fe136dadfb9}</UniqueIdentifier>
    </Filter>
@ -932,18 +950,6 @@
    <Filter Include="src\core\lib\json">
      <UniqueIdentifier>{681cdaeb-c47f-8853-d985-bf13c2873947}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\lib\proto">
-      <UniqueIdentifier>{4bfbd6c6-f6a8-c6b3-5186-b788f4e11e23}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\lib\proto\grpc">
-      <UniqueIdentifier>{60f3ab7d-ea44-348f-671e-77fdebbd18bb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\lib\proto\grpc\lb">
-      <UniqueIdentifier>{bcd33510-32e7-c2fb-e11d-a3655f97bc84}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\lib\proto\grpc\lb\v0">
-      <UniqueIdentifier>{bb9b8c80-9eff-5ab6-5b29-c2d54f0fc192}</UniqueIdentifier>
-    </Filter>
    <Filter Include="src\core\lib\statistics">
      <UniqueIdentifier>{d0ab6d54-ae25-fc49-3656-91d9db57366a}</UniqueIdentifier>
    </Filter>
@ -953,6 +959,9 @@
    <Filter Include="src\core\lib\transport">
      <UniqueIdentifier>{6c3394d1-27e9-003e-19ed-8116d210f7cc}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\core\plugin_registry">
+      <UniqueIdentifier>{babf0a90-e934-f599-5475-e6937d9580fe}</UniqueIdentifier>
+    </Filter>
    <Filter Include="third_party">
      <UniqueIdentifier>{025c051e-8eba-125b-67f9-173f95176eb2}</UniqueIdentifier>
    </Filter>