Merge branch 'master' into socklent

7 years ago · e63ab97f1b
parent ea37b0c8db c50ded274c
commit e63ab97f1b
1020 changed files with 58543 additions and 15534 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -5,6 +5,5 @@
 /bazel/** @nicolasnoble @dgquintas @a11r @vjpai
 /cmake/** @jtattermusch @nicolasnoble @matt-kwong
 /src/core/ext/filters/client_channel/** @markdroth @dgquintas @a11r
 /test/cpp/end2end/** @vjpai @yang-g @y-zeng
 /tools/dockerfile/** @jtattermusch @matt-kwong @nicolasnoble
 /tools/run_tests/performance/** @ncteisen @matt-kwong @jtattermusch
--- a/170
+++ b/170
@ -55,7 +55,7 @@ config_setting(
 config_setting(
    name = "windows",
-    values = { "cpu": "x64_windows" },
+    values = {"cpu": "x64_windows"},
 )
 config_setting(
@ -64,11 +64,11 @@ config_setting(
 )
 # This should be updated along with build.yaml
-g_stands_for = "glamorous"
+g_stands_for = "gorgeous"
 core_version = "6.0.0-dev"
-version = "1.10.0-dev"
+version = "1.11.0-dev"
 GPR_PUBLIC_HDRS = [
    "include/grpc/support/alloc.h",
@ -527,9 +527,6 @@ grpc_cc_library(
        "src/core/lib/gpr/sync.cc",
        "src/core/lib/gpr/sync_posix.cc",
        "src/core/lib/gpr/sync_windows.cc",
        "src/core/lib/gpr/thd.cc",
        "src/core/lib/gpr/thd_posix.cc",
        "src/core/lib/gpr/thd_windows.cc",
        "src/core/lib/gpr/time.cc",
        "src/core/lib/gpr/time_posix.cc",
        "src/core/lib/gpr/time_precise.cc",
@ -539,6 +536,8 @@ grpc_cc_library(
        "src/core/lib/gpr/tmpfile_posix.cc",
        "src/core/lib/gpr/tmpfile_windows.cc",
        "src/core/lib/gpr/wrap_memcpy.cc",
        "src/core/lib/gprpp/thd_posix.cc",
        "src/core/lib/gprpp/thd_windows.cc",
        "src/core/lib/profiling/basic_timers.cc",
        "src/core/lib/profiling/stap_timers.cc",
    ],
@ -552,7 +551,6 @@ grpc_cc_library(
        "src/core/lib/gpr/spinlock.h",
        "src/core/lib/gpr/string.h",
        "src/core/lib/gpr/string_windows.h",
        "src/core/lib/gpr/thd.h",
        "src/core/lib/gpr/time_precise.h",
        "src/core/lib/gpr/tls.h",
        "src/core/lib/gpr/tls_gcc.h",
@ -560,6 +558,10 @@ grpc_cc_library(
        "src/core/lib/gpr/tls_pthread.h",
        "src/core/lib/gpr/tmpfile.h",
        "src/core/lib/gpr/useful.h",
        "src/core/lib/gprpp/abstract.h",
        "src/core/lib/gprpp/manual_constructor.h",
        "src/core/lib/gprpp/memory.h",
        "src/core/lib/gprpp/thd.h",
        "src/core/lib/profiling/timers.h",
    ],
    language = "c++",
@ -601,16 +603,6 @@ grpc_cc_library(
    ],
 )
 grpc_cc_library(
    name = "gpr++_base",
    language = "c++",
    public_hdrs = [
        "src/core/lib/gprpp/abstract.h",
        "src/core/lib/gprpp/manual_constructor.h",
        "src/core/lib/gprpp/memory.h",
    ],
 )
 grpc_cc_library(
    name = "atomic",
    hdrs = [
@ -633,7 +625,7 @@ grpc_cc_library(
        "src/core/lib/gprpp/inlined_vector.h",
    ],
    deps = [
-        "gpr++_base",
+        "gpr_base",
    ],
 )
@ -649,7 +641,7 @@ grpc_cc_library(
    public_hdrs = ["src/core/lib/gprpp/orphanable.h"],
    deps = [
        "debug_location",
-        "gpr++_base",
+        "gpr_base",
        "grpc_trace",
        "ref_counted_ptr",
    ],
@ -661,7 +653,7 @@ grpc_cc_library(
    public_hdrs = ["src/core/lib/gprpp/ref_counted.h"],
    deps = [
        "debug_location",
-        "gpr++_base",
+        "gpr_base",
        "grpc_trace",
        "ref_counted_ptr",
    ],
@ -672,7 +664,7 @@ grpc_cc_library(
    language = "c++",
    public_hdrs = ["src/core/lib/gprpp/ref_counted_ptr.h"],
    deps = [
-        "gpr++_base",
+        "gpr_base",
    ],
 )
@ -779,7 +771,6 @@ grpc_cc_library(
        "src/core/lib/slice/percent_encoding.cc",
        "src/core/lib/slice/slice.cc",
        "src/core/lib/slice/slice_buffer.cc",
        "src/core/lib/slice/slice_hash_table.cc",
        "src/core/lib/slice/slice_intern.cc",
        "src/core/lib/slice/slice_string_helpers.cc",
        "src/core/lib/surface/api_trace.cc",
@ -809,6 +800,7 @@ grpc_cc_library(
        "src/core/lib/transport/service_config.cc",
        "src/core/lib/transport/static_metadata.cc",
        "src/core/lib/transport/status_conversion.cc",
        "src/core/lib/transport/status_metadata.cc",
        "src/core/lib/transport/timeout_encoding.cc",
        "src/core/lib/transport/transport.cc",
        "src/core/lib/transport/transport_op_string.cc",
@ -907,6 +899,7 @@ grpc_cc_library(
        "src/core/lib/slice/slice_hash_table.h",
        "src/core/lib/slice/slice_internal.h",
        "src/core/lib/slice/slice_string_helpers.h",
        "src/core/lib/slice/slice_weak_hash_table.h",
        "src/core/lib/surface/api_trace.h",
        "src/core/lib/surface/call.h",
        "src/core/lib/surface/call_test_only.h",
@ -931,6 +924,7 @@ grpc_cc_library(
        "src/core/lib/transport/service_config.h",
        "src/core/lib/transport/static_metadata.h",
        "src/core/lib/transport/status_conversion.h",
        "src/core/lib/transport/status_metadata.h",
        "src/core/lib/transport/timeout_encoding.h",
        "src/core/lib/transport/transport.h",
        "src/core/lib/transport/transport_impl.h",
@ -941,10 +935,12 @@ grpc_cc_library(
    language = "c++",
    public_hdrs = GRPC_PUBLIC_HDRS,
    deps = [
        "gpr++_base",
        "gpr_base",
        "grpc_codegen",
        "grpc_trace",
        "inlined_vector",
        "ref_counted",
        "ref_counted_ptr",
    ],
 )
@ -999,12 +995,14 @@ grpc_cc_library(
        "src/core/ext/filters/client_channel/lb_policy.cc",
        "src/core/ext/filters/client_channel/lb_policy_factory.cc",
        "src/core/ext/filters/client_channel/lb_policy_registry.cc",
        "src/core/ext/filters/client_channel/method_params.cc",
        "src/core/ext/filters/client_channel/parse_address.cc",
        "src/core/ext/filters/client_channel/proxy_mapper.cc",
        "src/core/ext/filters/client_channel/proxy_mapper_registry.cc",
        "src/core/ext/filters/client_channel/resolver.cc",
        "src/core/ext/filters/client_channel/resolver_registry.cc",
        "src/core/ext/filters/client_channel/retry_throttle.cc",
        "src/core/ext/filters/client_channel/status_util.cc",
        "src/core/ext/filters/client_channel/subchannel.cc",
        "src/core/ext/filters/client_channel/subchannel_index.cc",
        "src/core/ext/filters/client_channel/uri_parser.cc",
@ -1019,6 +1017,7 @@ grpc_cc_library(
        "src/core/ext/filters/client_channel/lb_policy.h",
        "src/core/ext/filters/client_channel/lb_policy_factory.h",
        "src/core/ext/filters/client_channel/lb_policy_registry.h",
        "src/core/ext/filters/client_channel/method_params.h",
        "src/core/ext/filters/client_channel/parse_address.h",
        "src/core/ext/filters/client_channel/proxy_mapper.h",
        "src/core/ext/filters/client_channel/proxy_mapper_registry.h",
@ -1026,6 +1025,7 @@ grpc_cc_library(
        "src/core/ext/filters/client_channel/resolver_factory.h",
        "src/core/ext/filters/client_channel/resolver_registry.h",
        "src/core/ext/filters/client_channel/retry_throttle.h",
        "src/core/ext/filters/client_channel/status_util.h",
        "src/core/ext/filters/client_channel/subchannel.h",
        "src/core/ext/filters/client_channel/subchannel_index.h",
        "src/core/ext/filters/client_channel/uri_parser.h",
@ -1148,7 +1148,6 @@ grpc_cc_library(
    ],
    hdrs = [
        "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h",
        "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h",
        "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h",
        "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h",
        "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
@ -1177,7 +1176,6 @@ grpc_cc_library(
    ],
    hdrs = [
        "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h",
        "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h",
        "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h",
        "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h",
        "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h",
@ -1328,12 +1326,14 @@ grpc_cc_library(
        "src/core/lib/security/credentials/oauth2/oauth2_credentials.cc",
        "src/core/lib/security/credentials/plugin/plugin_credentials.cc",
        "src/core/lib/security/credentials/ssl/ssl_credentials.cc",
        "src/core/lib/security/credentials/alts/alts_credentials.cc",
        "src/core/lib/security/security_connector/alts_security_connector.cc",
        "src/core/lib/security/security_connector/security_connector.cc",
        "src/core/lib/security/transport/client_auth_filter.cc",
        "src/core/lib/security/transport/lb_targets_info.cc",
        "src/core/lib/security/transport/secure_endpoint.cc",
        "src/core/lib/security/transport/security_connector.cc",
        "src/core/lib/security/transport/security_handshaker.cc",
        "src/core/lib/security/transport/server_auth_filter.cc",
        "src/core/lib/security/transport/target_authority_table.cc",
        "src/core/lib/security/transport/tsi_error.cc",
        "src/core/lib/security/util/json_util.cc",
        "src/core/lib/surface/init_secure.cc",
@ -1351,17 +1351,20 @@ grpc_cc_library(
        "src/core/lib/security/credentials/oauth2/oauth2_credentials.h",
        "src/core/lib/security/credentials/plugin/plugin_credentials.h",
        "src/core/lib/security/credentials/ssl/ssl_credentials.h",
        "src/core/lib/security/credentials/alts/alts_credentials.h",
        "src/core/lib/security/security_connector/alts_security_connector.h",
        "src/core/lib/security/security_connector/security_connector.h",
        "src/core/lib/security/transport/auth_filters.h",
        "src/core/lib/security/transport/lb_targets_info.h",
        "src/core/lib/security/transport/secure_endpoint.h",
        "src/core/lib/security/transport/security_connector.h",
        "src/core/lib/security/transport/security_handshaker.h",
        "src/core/lib/security/transport/target_authority_table.h",
        "src/core/lib/security/transport/tsi_error.h",
        "src/core/lib/security/util/json_util.h",
    ],
    language = "c++",
    public_hdrs = GRPC_SECURE_PUBLIC_HDRS,
    deps = [
        "alts_util",
        "grpc_base",
        "grpc_transport_chttp2_alpn",
        "tsi",
@ -1418,7 +1421,7 @@ grpc_cc_library(
    ],
    language = "c++",
    deps = [
-        "gpr++_base",
+        "gpr_base",
        "grpc_base",
        "grpc_http_filters",
        "grpc_transport_chttp2_alpn",
@ -1584,16 +1587,119 @@ grpc_cc_library(
    ],
 )
 grpc_cc_library(
    name = "alts_frame_protector",
    srcs = [
        "src/core/tsi/alts/crypt/aes_gcm.cc",
        "src/core/tsi/alts/crypt/gsec.cc",
        "src/core/tsi/alts/frame_protector/alts_counter.cc",
        "src/core/tsi/alts/frame_protector/alts_crypter.cc",
        "src/core/tsi/alts/frame_protector/alts_frame_protector.cc",
        "src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc",
        "src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc",
        "src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc",
        "src/core/tsi/alts/frame_protector/frame_handler.cc",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc",
    ],
    hdrs = [
        "src/core/tsi/alts/crypt/gsec.h",
        "src/core/tsi/alts/frame_protector/alts_counter.h",
        "src/core/tsi/alts/frame_protector/alts_crypter.h",
        "src/core/tsi/alts/frame_protector/alts_frame_protector.h",
        "src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h",
        "src/core/tsi/alts/frame_protector/frame_handler.h",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h",
        "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h",
        "src/core/tsi/transport_security_grpc.h",
    ],
    external_deps = [
        "libssl",
    ],
    language = "c++",
    deps = [
        "gpr",
        "grpc_base",
        "tsi_interface",
    ],
 )
 grpc_cc_library(
    name = "alts_proto",
    srcs = [
        "src/core/tsi/alts/handshaker/altscontext.pb.c",
        "src/core/tsi/alts/handshaker/handshaker.pb.c",
        "src/core/tsi/alts/handshaker/transport_security_common.pb.c",
    ],
    hdrs = [
        "src/core/tsi/alts/handshaker/altscontext.pb.h",
        "src/core/tsi/alts/handshaker/handshaker.pb.h",
        "src/core/tsi/alts/handshaker/transport_security_common.pb.h",
    ],
    external_deps = [
        "nanopb",
    ],
    language = "c++",
 )
 grpc_cc_library(
    name = "alts_util",
    srcs = [
        "src/core/lib/security/credentials/alts/check_gcp_environment.cc",
        "src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc",
        "src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc",
        "src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc",
        "src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc",
        "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc",
        "src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc",
        "src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc",
        "src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc",
        "src/core/tsi/alts/handshaker/transport_security_common_api.cc",
    ],
    hdrs = [
        "src/core/lib/security/credentials/alts/check_gcp_environment.h",
        "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h",
        "src/core/tsi/alts/handshaker/alts_handshaker_service_api.h",
        "src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h",
        "src/core/tsi/alts/handshaker/transport_security_common_api.h",
    ],
    external_deps = [
        "nanopb",
    ],
    language = "c++",
    deps = [
      "alts_proto",
      "gpr",
      "grpc_base",
    ],
 )
 grpc_cc_library(
    name = "tsi",
    srcs = [
        "src/core/tsi/alts_transport_security.cc",
        "src/core/tsi/alts/handshaker/alts_handshaker_client.cc",
        "src/core/tsi/alts/handshaker/alts_tsi_event.cc",
        "src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc",
        "src/core/tsi/alts/handshaker/alts_tsi_utils.cc",
        "src/core/tsi/fake_transport_security.cc",
        "src/core/tsi/ssl_transport_security.cc",
        "src/core/tsi/transport_security_grpc.cc",
    ],
    hdrs = [
        "src/core/tsi/alts_transport_security.h",
        "src/core/tsi/alts/handshaker/alts_handshaker_client.h",
        "src/core/tsi/alts/handshaker/alts_tsi_event.h",
        "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h",
        "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h",
        "src/core/tsi/alts/handshaker/alts_tsi_utils.h",
        "src/core/tsi/fake_transport_security.h",
        "src/core/tsi/ssl_transport_security.h",
        "src/core/tsi/ssl_types.h",
@ -1604,7 +1710,11 @@ grpc_cc_library(
    ],
    language = "c++",
    deps = [
        "alts_frame_protector",
        "alts_util",
        "gpr",
        "grpc_base",
        "grpc_transport_chttp2_client_insecure",
        "tsi_interface",
    ],
 )
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/1679
+++ b/1679
--- a/README.md
+++ b/README.md
@ -1,5 +1,3 @@
 [![Build Status](https://grpc-testing.appspot.com/job/gRPC_master/badge/icon)](https://grpc-testing.appspot.com/job/gRPC_master)
 [gRPC - An RPC library and framework](http://github.com/grpc/grpc)
 ===================================
@ -36,10 +34,12 @@ Libraries in different languages may be in different states of development. We a
 | C#                      | [src/csharp](src/csharp)            |
 | Objective-C             | [src/objective-c](src/objective-c)  |
-Java source code is in the [grpc-java](http://github.com/grpc/grpc-java)
+| Language                | Source repo                                          |
-repository. Go source code is in the
+|-------------------------|------------------------------------------------------|
-[grpc-go](http://github.com/grpc/grpc-go) repository. NodeJS source code is in the
+| Java                    | [grpc-java](http://github.com/grpc/grpc-java)        |
-[grpc-node](https://github.com/grpc/grpc-node) repository.
+| Go                      | [grpc-go](http://github.com/grpc/grpc-go)            |
 | NodeJS                  | [grpc-node](https://github.com/grpc/grpc-node)       |
 | Dart                    | [grpc-dart](https://github.com/grpc/grpc-dart)       |
 See [MANIFEST.md](MANIFEST.md) for a listing of top-level items in the
 repository.
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@ -57,6 +57,12 @@ def _maybe_update_cc_library_hdrs(hdrs):
      ret.append(h)
  return ret
 def _maybe_update_cc_library_defines(name):
  ret = []
  if name == "alts_proto":
    ret += ["PB_FIELD_16BIT=1"]
  return ret
 def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
                    external_deps = [], deps = [], standalone = False,
                    language = "C++", testonly = False, visibility = None,
@ -64,10 +70,11 @@ def grpc_cc_library(name, srcs = [], public_hdrs = [], hdrs = [],
  copts = []
  if language.upper() == "C":
    copts = if_not_windows(["-std=c99"])
  defines = _maybe_update_cc_library_defines(name)
  native.cc_library(
    name = name,
    srcs = srcs,
-    defines = select({"//:grpc_no_ares": ["GRPC_ARES=0"],
+    defines = defines + select({"//:grpc_no_ares": ["GRPC_ARES=0"],
                      "//conditions:default": [],}) +
              select({"//:remote_execution":  ["GRPC_PORT_ISOLATED_RUNTIME=1"],
                      "//conditions:default": [],}) +
@ -170,17 +177,14 @@ def grpc_sh_binary(name, srcs, data = []):
    srcs = srcs,
    data = data)
-def grpc_py_binary(name, srcs, data = [], deps = []):
+def grpc_py_binary(name, srcs, data = [], deps = [], external_deps = [], testonly = False):
  if name == "test_dns_server":
    deps = _get_external_deps([
      "twisted",
      "yaml",
    ])
  native.py_binary(
    name = name,
    srcs = srcs,
    testonly = testonly,
    data = data,
-    deps = deps)
+    deps = deps + _get_external_deps(external_deps)
  )
 def grpc_package(name, visibility = "private", features = []):
  if visibility == "tests":
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -120,12 +120,12 @@ def grpc_deps():
    if "com_github_bazelbuild_bazeltoolchains" not in native.existing_rules():
        native.http_archive(
            name = "com_github_bazelbuild_bazeltoolchains",
-            strip_prefix = "bazel-toolchains-f3b09700fae5d7b6e659d7cefe0dcc6e8498504c",
+            strip_prefix = "bazel-toolchains-b850ccdf53fed1ccab7670f52d6b297d74348d1b",
            urls = [
-                "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/f3b09700fae5d7b6e659d7cefe0dcc6e8498504c.tar.gz",
+                "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/b850ccdf53fed1ccab7670f52d6b297d74348d1b.tar.gz",
-                "https://github.com/bazelbuild/bazel-toolchains/archive/f3b09700fae5d7b6e659d7cefe0dcc6e8498504c.tar.gz",
+                "https://github.com/bazelbuild/bazel-toolchains/archive/b850ccdf53fed1ccab7670f52d6b297d74348d1b.tar.gz",
            ],
-            sha256 = "ed829b5eea8af1f405f4cc3d6ecfc3b1365bb7843171036030a31b5127002311",
+            sha256 = "d84d6b2fe88ef99963febf91ddce33503eed14c155ace922e2122271b483be64",
        )
 # TODO: move some dependencies from "grpc_deps" here?
--- a/build.yaml
+++ b/build.yaml
@ -13,9 +13,87 @@ settings:
  '#09': Per-language overrides are possible with (eg) ruby_version tag here
  '#10': See the expand_version.py for all the quirks here
  core_version: 6.0.0-dev
-  g_stands_for: glamorous
+  g_stands_for: gorgeous
-  version: 1.10.0-dev
+  version: 1.11.0-dev
 filegroups:
 - name: alts_proto
  headers:
  - src/core/tsi/alts/handshaker/altscontext.pb.h
  - src/core/tsi/alts/handshaker/handshaker.pb.h
  - src/core/tsi/alts/handshaker/transport_security_common.pb.h
  src:
  - src/core/tsi/alts/handshaker/altscontext.pb.c
  - src/core/tsi/alts/handshaker/handshaker.pb.c
  - src/core/tsi/alts/handshaker/transport_security_common.pb.c
  uses:
  - nanopb
 - name: alts_tsi
  headers:
  - src/core/tsi/alts/crypt/gsec.h
  - src/core/tsi/alts/frame_protector/alts_counter.h
  - src/core/tsi/alts/frame_protector/alts_crypter.h
  - src/core/tsi/alts/frame_protector/alts_frame_protector.h
  - src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h
  - src/core/tsi/alts/frame_protector/frame_handler.h
  - src/core/tsi/alts/handshaker/alts_handshaker_client.h
  - src/core/tsi/alts/handshaker/alts_tsi_event.h
  - src/core/tsi/alts/handshaker/alts_tsi_handshaker.h
  - src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h
  - src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h
  - src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h
  - src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h
  - src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h
  - src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h
  - src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h
  src:
  - src/core/tsi/alts/crypt/aes_gcm.cc
  - src/core/tsi/alts/crypt/gsec.cc
  - src/core/tsi/alts/frame_protector/alts_counter.cc
  - src/core/tsi/alts/frame_protector/alts_crypter.cc
  - src/core/tsi/alts/frame_protector/alts_frame_protector.cc
  - src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc
  - src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc
  - src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc
  - src/core/tsi/alts/frame_protector/frame_handler.cc
  - src/core/tsi/alts/handshaker/alts_handshaker_client.cc
  - src/core/tsi/alts/handshaker/alts_tsi_event.cc
  - src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
  - src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc
  - src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc
  - src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc
  - src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc
  - src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc
  uses:
  - alts_util
  - grpc_base
  - grpc_transport_chttp2_client_insecure
  - tsi_interface
  - tsi
 - name: alts_util
  headers:
  - src/core/lib/security/credentials/alts/check_gcp_environment.h
  - src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h
  - src/core/tsi/alts/handshaker/alts_handshaker_service_api.h
  - src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h
  - src/core/tsi/alts/handshaker/alts_tsi_utils.h
  - src/core/tsi/alts/handshaker/transport_security_common_api.h
  src:
  - src/core/lib/security/credentials/alts/check_gcp_environment.cc
  - src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
  - src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
  - src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
  - src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
  - src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
  - src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc
  - src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc
  - src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc
  - src/core/tsi/alts/handshaker/alts_tsi_utils.cc
  - src/core/tsi/alts/handshaker/transport_security_common_api.cc
  uses:
  - alts_proto
  - grpc_base
  - tsi_interface
  - nanopb
 - name: census
  public_headers:
  - include/grpc/census.h
@ -59,9 +137,6 @@ filegroups:
  - src/core/lib/gpr/sync.cc
  - src/core/lib/gpr/sync_posix.cc
  - src/core/lib/gpr/sync_windows.cc
  - src/core/lib/gpr/thd.cc
  - src/core/lib/gpr/thd_posix.cc
  - src/core/lib/gpr/thd_windows.cc
  - src/core/lib/gpr/time.cc
  - src/core/lib/gpr/time_posix.cc
  - src/core/lib/gpr/time_precise.cc
@ -71,6 +146,8 @@ filegroups:
  - src/core/lib/gpr/tmpfile_posix.cc
  - src/core/lib/gpr/tmpfile_windows.cc
  - src/core/lib/gpr/wrap_memcpy.cc
  - src/core/lib/gprpp/thd_posix.cc
  - src/core/lib/gprpp/thd_windows.cc
  - src/core/lib/profiling/basic_timers.cc
  - src/core/lib/profiling/stap_timers.cc
  uses:
@ -104,7 +181,6 @@ filegroups:
  - src/core/lib/gpr/spinlock.h
  - src/core/lib/gpr/string.h
  - src/core/lib/gpr/string_windows.h
  - src/core/lib/gpr/thd.h
  - src/core/lib/gpr/time_precise.h
  - src/core/lib/gpr/tls.h
  - src/core/lib/gpr/tls_gcc.h
@ -118,6 +194,7 @@ filegroups:
  - src/core/lib/gprpp/atomic_with_std.h
  - src/core/lib/gprpp/manual_constructor.h
  - src/core/lib/gprpp/memory.h
  - src/core/lib/gprpp/thd.h
  - src/core/lib/profiling/timers.h
  uses:
  - gpr_codegen
@ -250,7 +327,6 @@ filegroups:
  - src/core/lib/slice/percent_encoding.cc
  - src/core/lib/slice/slice.cc
  - src/core/lib/slice/slice_buffer.cc
  - src/core/lib/slice/slice_hash_table.cc
  - src/core/lib/slice/slice_intern.cc
  - src/core/lib/slice/slice_string_helpers.cc
  - src/core/lib/surface/api_trace.cc
@ -281,6 +357,7 @@ filegroups:
  - src/core/lib/transport/service_config.cc
  - src/core/lib/transport/static_metadata.cc
  - src/core/lib/transport/status_conversion.cc
  - src/core/lib/transport/status_metadata.cc
  - src/core/lib/transport/timeout_encoding.cc
  - src/core/lib/transport/transport.cc
  - src/core/lib/transport/transport_op_string.cc
@ -404,6 +481,7 @@ filegroups:
  - src/core/lib/slice/slice_hash_table.h
  - src/core/lib/slice/slice_internal.h
  - src/core/lib/slice/slice_string_helpers.h
  - src/core/lib/slice/slice_weak_hash_table.h
  - src/core/lib/surface/api_trace.h
  - src/core/lib/surface/call.h
  - src/core/lib/surface/call_test_only.h
@ -428,6 +506,7 @@ filegroups:
  - src/core/lib/transport/service_config.h
  - src/core/lib/transport/static_metadata.h
  - src/core/lib/transport/status_conversion.h
  - src/core/lib/transport/status_metadata.h
  - src/core/lib/transport/timeout_encoding.h
  - src/core/lib/transport/transport.h
  - src/core/lib/transport/transport_impl.h
@ -447,6 +526,7 @@ filegroups:
  - src/core/ext/filters/client_channel/lb_policy.h
  - src/core/ext/filters/client_channel/lb_policy_factory.h
  - src/core/ext/filters/client_channel/lb_policy_registry.h
  - src/core/ext/filters/client_channel/method_params.h
  - src/core/ext/filters/client_channel/parse_address.h
  - src/core/ext/filters/client_channel/proxy_mapper.h
  - src/core/ext/filters/client_channel/proxy_mapper_registry.h
@ -454,6 +534,7 @@ filegroups:
  - src/core/ext/filters/client_channel/resolver_factory.h
  - src/core/ext/filters/client_channel/resolver_registry.h
  - src/core/ext/filters/client_channel/retry_throttle.h
  - src/core/ext/filters/client_channel/status_util.h
  - src/core/ext/filters/client_channel/subchannel.h
  - src/core/ext/filters/client_channel/subchannel_index.h
  - src/core/ext/filters/client_channel/uri_parser.h
@ -469,12 +550,14 @@ filegroups:
  - src/core/ext/filters/client_channel/lb_policy.cc
  - src/core/ext/filters/client_channel/lb_policy_factory.cc
  - src/core/ext/filters/client_channel/lb_policy_registry.cc
  - src/core/ext/filters/client_channel/method_params.cc
  - src/core/ext/filters/client_channel/parse_address.cc
  - src/core/ext/filters/client_channel/proxy_mapper.cc
  - src/core/ext/filters/client_channel/proxy_mapper_registry.cc
  - src/core/ext/filters/client_channel/resolver.cc
  - src/core/ext/filters/client_channel/resolver_registry.cc
  - src/core/ext/filters/client_channel/retry_throttle.cc
  - src/core/ext/filters/client_channel/status_util.cc
  - src/core/ext/filters/client_channel/subchannel.cc
  - src/core/ext/filters/client_channel/subchannel_index.cc
  - src/core/ext/filters/client_channel/uri_parser.cc
@ -518,7 +601,6 @@ filegroups:
 - name: grpc_lb_policy_grpclb
  headers:
  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h
  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h
@ -539,7 +621,6 @@ filegroups:
 - name: grpc_lb_policy_grpclb_secure
  headers:
  - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h
  - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h
  - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h
@ -639,6 +720,7 @@ filegroups:
  - include/grpc/grpc_security.h
  headers:
  - src/core/lib/security/context/security_context.h
  - src/core/lib/security/credentials/alts/alts_credentials.h
  - src/core/lib/security/credentials/composite/composite_credentials.h
  - src/core/lib/security/credentials/credentials.h
  - src/core/lib/security/credentials/fake/fake_credentials.h
@ -650,16 +732,18 @@ filegroups:
  - src/core/lib/security/credentials/oauth2/oauth2_credentials.h
  - src/core/lib/security/credentials/plugin/plugin_credentials.h
  - src/core/lib/security/credentials/ssl/ssl_credentials.h
  - src/core/lib/security/security_connector/alts_security_connector.h
  - src/core/lib/security/security_connector/security_connector.h
  - src/core/lib/security/transport/auth_filters.h
  - src/core/lib/security/transport/lb_targets_info.h
  - src/core/lib/security/transport/secure_endpoint.h
  - src/core/lib/security/transport/security_connector.h
  - src/core/lib/security/transport/security_handshaker.h
  - src/core/lib/security/transport/target_authority_table.h
  - src/core/lib/security/transport/tsi_error.h
  - src/core/lib/security/util/json_util.h
  src:
  - src/core/lib/http/httpcli_security_connector.cc
  - src/core/lib/security/context/security_context.cc
  - src/core/lib/security/credentials/alts/alts_credentials.cc
  - src/core/lib/security/credentials/composite/composite_credentials.cc
  - src/core/lib/security/credentials/credentials.cc
  - src/core/lib/security/credentials/credentials_metadata.cc
@ -673,17 +757,19 @@ filegroups:
  - src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
  - src/core/lib/security/credentials/plugin/plugin_credentials.cc
  - src/core/lib/security/credentials/ssl/ssl_credentials.cc
  - src/core/lib/security/security_connector/alts_security_connector.cc
  - src/core/lib/security/security_connector/security_connector.cc
  - src/core/lib/security/transport/client_auth_filter.cc
  - src/core/lib/security/transport/lb_targets_info.cc
  - src/core/lib/security/transport/secure_endpoint.cc
  - src/core/lib/security/transport/security_connector.cc
  - src/core/lib/security/transport/security_handshaker.cc
  - src/core/lib/security/transport/server_auth_filter.cc
  - src/core/lib/security/transport/target_authority_table.cc
  - src/core/lib/security/transport/tsi_error.cc
  - src/core/lib/security/util/json_util.cc
  - src/core/lib/surface/init_secure.cc
  secure: true
  uses:
  - alts_tsi
  - grpc_base
  - grpc_transport_chttp2_alpn
  - tsi
@ -1208,6 +1294,18 @@ filegroups:
  - grpc++
  - grpc
 libs:
 - name: alts_test_util
  build: private
  language: c
  headers:
  - test/core/tsi/alts/crypt/gsec_test_util.h
  - test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h
  src:
  - test/core/tsi/alts/crypt/gsec_test_util.cc
  - test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc
  deps:
  - grpc
  secure: true
 - name: gpr
  build: all
  language: c
@ -2326,7 +2424,7 @@ targets:
  build: test
  language: c
  src:
-  - test/core/gpr/thd_test.cc
+  - test/core/gprpp/thd_test.cc
  deps:
  - gpr_test_util
  - gpr
@ -3149,17 +3247,6 @@ targets:
  - gpr_test_util
  - gpr
  uses_polling: false
 - name: slice_hash_table_test
  build: test
  language: c
  src:
  - test/core/slice/slice_hash_table_test.cc
  deps:
  - grpc_test_util
  - grpc
  - gpr_test_util
  - gpr
  uses_polling: false
 - name: slice_string_helpers_test
  build: test
  language: c
@ -3504,6 +3591,125 @@ targets:
  - grpc_unsecure
  - gpr_test_util
  - gpr
 - name: alts_counter_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/frame_protector/alts_counter_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_crypt_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/crypt/aes_gcm_test.cc
  deps:
  - alts_test_util
  - gpr_test_util
  - gpr
  - grpc
 - name: alts_crypter_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/frame_protector/alts_crypter_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_frame_handler_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/frame_protector/frame_handler_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_frame_protector_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
  filegroups:
  - transport_security_test_lib
 - name: alts_grpc_record_protocol_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_handshaker_client_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_handshaker_service_api_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/handshaker/alts_handshaker_service_api_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_iovec_record_protocol_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_security_connector_test
  build: test
  language: c++
  src:
  - test/core/security/alts_security_connector_test.cc
  deps:
  - gpr
  - grpc
 - name: alts_tsi_handshaker_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_tsi_utils_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: alts_zero_copy_grpc_protector_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: async_end2end_test
  gtest: true
  build: test
@ -3887,6 +4093,22 @@ targets:
  - grpc
  - gpr
  uses_polling: false
 - name: check_gcp_environment_linux_test
  build: test
  language: c++
  src:
  - test/core/security/check_gcp_environment_linux_test.cc
  deps:
  - grpc
  - gpr
 - name: check_gcp_environment_windows_test
  build: test
  language: c++
  src:
  - test/core/security/check_gcp_environment_windows_test.cc
  deps:
  - grpc
  - gpr
 - name: chttp2_settings_timeout_test
  gtest: true
  build: test
@ -4145,6 +4367,14 @@ targets:
  args:
  - --generated_file_path=gens/src/proto/grpc/testing/
  uses_polling: false
 - name: grpc_alts_credentials_options_test
  build: test
  language: c++
  src:
  - test/core/security/grpc_alts_credentials_options_test.cc
  deps:
  - grpc
  - gpr
 - name: grpc_cli
  build: test
  run: false
@ -4829,6 +5059,30 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
 - name: slice_hash_table_test
  gtest: true
  build: test
  language: c++
  src:
  - test/core/slice/slice_hash_table_test.cc
  deps:
  - grpc_test_util
  - grpc
  - gpr_test_util
  - gpr
  uses_polling: false
 - name: slice_weak_hash_table_test
  gtest: true
  build: test
  language: c++
  src:
  - test/core/slice/slice_weak_hash_table_test.cc
  deps:
  - grpc_test_util
  - grpc
  - gpr_test_util
  - gpr
  uses_polling: false
 - name: stats_test
  gtest: true
  build: test
@ -4845,6 +5099,15 @@ targets:
  - tsan
  timeout_seconds: 1200
  uses_polling: false
 - name: status_metadata_test
  gtest: true
  build: test
  language: c++
  src:
  - test/core/transport/status_metadata_test.cc
  deps:
  - grpc
  uses_polling: false
 - name: status_test
  build: test
  language: c++
@ -4857,6 +5120,16 @@ targets:
  - gpr_test_util
  - gpr
  uses_polling: false
 - name: status_util_test
  gtest: true
  cpu_cost: 0.1
  build: test
  language: c++
  src:
  - test/core/client_channel/status_util_test.cc
  deps:
  - grpc
  uses_polling: false
 - name: streaming_throughput_test
  gtest: true
  build: test
@ -4937,6 +5210,15 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
 - name: transport_security_common_api_test
  build: test
  language: c++
  src:
  - test/core/tsi/alts/handshaker/transport_security_common_api_test.cc
  deps:
  - alts_test_util
  - gpr
  - grpc
 - name: writes_per_rpc_test
  gtest: true
  cpu_cost: 0.5
--- a/config.m4
+++ b/config.m4
@ -65,9 +65,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/gpr/sync.cc \
    src/core/lib/gpr/sync_posix.cc \
    src/core/lib/gpr/sync_windows.cc \
    src/core/lib/gpr/thd.cc \
    src/core/lib/gpr/thd_posix.cc \
    src/core/lib/gpr/thd_windows.cc \
    src/core/lib/gpr/time.cc \
    src/core/lib/gpr/time_posix.cc \
    src/core/lib/gpr/time_precise.cc \
@ -77,6 +74,8 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/gpr/tmpfile_posix.cc \
    src/core/lib/gpr/tmpfile_windows.cc \
    src/core/lib/gpr/wrap_memcpy.cc \
    src/core/lib/gprpp/thd_posix.cc \
    src/core/lib/gprpp/thd_windows.cc \
    src/core/lib/profiling/basic_timers.cc \
    src/core/lib/profiling/stap_timers.cc \
    src/core/lib/surface/init.cc \
@ -180,7 +179,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/slice/percent_encoding.cc \
    src/core/lib/slice/slice.cc \
    src/core/lib/slice/slice_buffer.cc \
    src/core/lib/slice/slice_hash_table.cc \
    src/core/lib/slice/slice_intern.cc \
    src/core/lib/slice/slice_string_helpers.cc \
    src/core/lib/surface/api_trace.cc \
@ -211,6 +209,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/transport/service_config.cc \
    src/core/lib/transport/static_metadata.cc \
    src/core/lib/transport/status_conversion.cc \
    src/core/lib/transport/status_metadata.cc \
    src/core/lib/transport/timeout_encoding.cc \
    src/core/lib/transport/transport.cc \
    src/core/lib/transport/transport_op_string.cc \
@ -245,6 +244,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/http/server/http_server_filter.cc \
    src/core/lib/http/httpcli_security_connector.cc \
    src/core/lib/security/context/security_context.cc \
    src/core/lib/security/credentials/alts/alts_credentials.cc \
    src/core/lib/security/credentials/composite/composite_credentials.cc \
    src/core/lib/security/credentials/credentials.cc \
    src/core/lib/security/credentials/credentials_metadata.cc \
@ -258,23 +258,55 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
    src/core/lib/security/credentials/plugin/plugin_credentials.cc \
    src/core/lib/security/credentials/ssl/ssl_credentials.cc \
    src/core/lib/security/security_connector/alts_security_connector.cc \
    src/core/lib/security/security_connector/security_connector.cc \
    src/core/lib/security/transport/client_auth_filter.cc \
    src/core/lib/security/transport/lb_targets_info.cc \
    src/core/lib/security/transport/secure_endpoint.cc \
    src/core/lib/security/transport/security_connector.cc \
    src/core/lib/security/transport/security_handshaker.cc \
    src/core/lib/security/transport/server_auth_filter.cc \
    src/core/lib/security/transport/target_authority_table.cc \
    src/core/lib/security/transport/tsi_error.cc \
    src/core/lib/security/util/json_util.cc \
    src/core/lib/surface/init_secure.cc \
-    src/core/tsi/alts_transport_security.cc \
+    src/core/tsi/alts/crypt/aes_gcm.cc \
-    src/core/tsi/fake_transport_security.cc \
+    src/core/tsi/alts/crypt/gsec.cc \
-    src/core/tsi/ssl_transport_security.cc \
+    src/core/tsi/alts/frame_protector/alts_counter.cc \
-    src/core/tsi/transport_security_grpc.cc \
+    src/core/tsi/alts/frame_protector/alts_crypter.cc \
    src/core/tsi/alts/frame_protector/alts_frame_protector.cc \
    src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc \
    src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc \
    src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc \
    src/core/tsi/alts/frame_protector/frame_handler.cc \
    src/core/tsi/alts/handshaker/alts_handshaker_client.cc \
    src/core/tsi/alts/handshaker/alts_tsi_event.cc \
    src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc \
    src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc \
    src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc \
    src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc \
    src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc \
    src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc \
    src/core/lib/security/credentials/alts/check_gcp_environment.cc \
    src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc \
    src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc \
    src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc \
    src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc \
    src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc \
    src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc \
    src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc \
    src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc \
    src/core/tsi/alts/handshaker/alts_tsi_utils.cc \
    src/core/tsi/alts/handshaker/transport_security_common_api.cc \
    src/core/tsi/alts/handshaker/altscontext.pb.c \
    src/core/tsi/alts/handshaker/handshaker.pb.c \
    src/core/tsi/alts/handshaker/transport_security_common.pb.c \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
    src/core/tsi/transport_security.cc \
    src/core/tsi/transport_security_adapter.cc \
-    src/core/ext/transport/chttp2/server/chttp2_server.cc \
+    src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
-    src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
+    src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/ext/filters/client_channel/backup_poller.cc \
    src/core/ext/filters/client_channel/channel_connectivity.cc \
    src/core/ext/filters/client_channel/client_channel.cc \
@ -286,21 +318,26 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/client_channel/lb_policy.cc \
    src/core/ext/filters/client_channel/lb_policy_factory.cc \
    src/core/ext/filters/client_channel/lb_policy_registry.cc \
    src/core/ext/filters/client_channel/method_params.cc \
    src/core/ext/filters/client_channel/parse_address.cc \
    src/core/ext/filters/client_channel/proxy_mapper.cc \
    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
    src/core/ext/filters/client_channel/resolver.cc \
    src/core/ext/filters/client_channel/resolver_registry.cc \
    src/core/ext/filters/client_channel/retry_throttle.cc \
    src/core/ext/filters/client_channel/status_util.cc \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_index.cc \
    src/core/ext/filters/client_channel/uri_parser.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
-    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
+    src/core/tsi/alts_transport_security.cc \
    src/core/tsi/fake_transport_security.cc \
    src/core/tsi/ssl_transport_security.cc \
    src/core/tsi/transport_security_grpc.cc \
    src/core/ext/transport/chttp2/server/chttp2_server.cc \
    src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
    src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
    src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
    src/core/ext/transport/inproc/inproc_plugin.cc \
    src/core/ext/transport/inproc/inproc_transport.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \
@ -309,9 +346,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
    src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
    src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
    src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc \
@ -399,7 +433,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/crypto/cpu-intel.c \
    third_party/boringssl/crypto/cpu-ppc64le.c \
    third_party/boringssl/crypto/crypto.c \
    third_party/boringssl/crypto/curve25519/curve25519.c \
    third_party/boringssl/crypto/curve25519/spake25519.c \
    third_party/boringssl/crypto/curve25519/x25519-x86_64.c \
    third_party/boringssl/crypto/dh/check.c \
@ -585,6 +618,7 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl/ssl/tls13_server.cc \
    third_party/boringssl/ssl/tls_method.cc \
    third_party/boringssl/ssl/tls_record.cc \
    third_party/boringssl/third_party/fiat/curve25519.c \
    , $ext_shared, , -fvisibility=hidden \
    -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
    -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0)
@ -627,12 +661,14 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/http)
  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/security/context)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/alts)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/composite)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/fake)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/google_default)
@ -641,6 +677,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/oauth2)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/plugin)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/ssl)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/security_connector)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/transport)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/util)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/slice)
@ -648,6 +685,10 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/crypt)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/frame_protector)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/handshaker)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/zero_copy_frame_protector)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/asn1)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/base64)
@ -685,5 +726,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/x509)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/x509v3)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/ssl)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/third_party/fiat)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/nanopb)
 fi
--- a/config.w32
+++ b/config.w32
@ -42,9 +42,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\gpr\\sync.cc " +
    "src\\core\\lib\\gpr\\sync_posix.cc " +
    "src\\core\\lib\\gpr\\sync_windows.cc " +
    "src\\core\\lib\\gpr\\thd.cc " +
    "src\\core\\lib\\gpr\\thd_posix.cc " +
    "src\\core\\lib\\gpr\\thd_windows.cc " +
    "src\\core\\lib\\gpr\\time.cc " +
    "src\\core\\lib\\gpr\\time_posix.cc " +
    "src\\core\\lib\\gpr\\time_precise.cc " +
@ -54,6 +51,8 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\gpr\\tmpfile_posix.cc " +
    "src\\core\\lib\\gpr\\tmpfile_windows.cc " +
    "src\\core\\lib\\gpr\\wrap_memcpy.cc " +
    "src\\core\\lib\\gprpp\\thd_posix.cc " +
    "src\\core\\lib\\gprpp\\thd_windows.cc " +
    "src\\core\\lib\\profiling\\basic_timers.cc " +
    "src\\core\\lib\\profiling\\stap_timers.cc " +
    "src\\core\\lib\\surface\\init.cc " +
@ -157,7 +156,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\slice\\percent_encoding.cc " +
    "src\\core\\lib\\slice\\slice.cc " +
    "src\\core\\lib\\slice\\slice_buffer.cc " +
    "src\\core\\lib\\slice\\slice_hash_table.cc " +
    "src\\core\\lib\\slice\\slice_intern.cc " +
    "src\\core\\lib\\slice\\slice_string_helpers.cc " +
    "src\\core\\lib\\surface\\api_trace.cc " +
@ -188,6 +186,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\transport\\service_config.cc " +
    "src\\core\\lib\\transport\\static_metadata.cc " +
    "src\\core\\lib\\transport\\status_conversion.cc " +
    "src\\core\\lib\\transport\\status_metadata.cc " +
    "src\\core\\lib\\transport\\timeout_encoding.cc " +
    "src\\core\\lib\\transport\\transport.cc " +
    "src\\core\\lib\\transport\\transport_op_string.cc " +
@ -222,6 +221,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\http\\server\\http_server_filter.cc " +
    "src\\core\\lib\\http\\httpcli_security_connector.cc " +
    "src\\core\\lib\\security\\context\\security_context.cc " +
    "src\\core\\lib\\security\\credentials\\alts\\alts_credentials.cc " +
    "src\\core\\lib\\security\\credentials\\composite\\composite_credentials.cc " +
    "src\\core\\lib\\security\\credentials\\credentials.cc " +
    "src\\core\\lib\\security\\credentials\\credentials_metadata.cc " +
@ -235,23 +235,55 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\security\\credentials\\oauth2\\oauth2_credentials.cc " +
    "src\\core\\lib\\security\\credentials\\plugin\\plugin_credentials.cc " +
    "src\\core\\lib\\security\\credentials\\ssl\\ssl_credentials.cc " +
    "src\\core\\lib\\security\\security_connector\\alts_security_connector.cc " +
    "src\\core\\lib\\security\\security_connector\\security_connector.cc " +
    "src\\core\\lib\\security\\transport\\client_auth_filter.cc " +
    "src\\core\\lib\\security\\transport\\lb_targets_info.cc " +
    "src\\core\\lib\\security\\transport\\secure_endpoint.cc " +
    "src\\core\\lib\\security\\transport\\security_connector.cc " +
    "src\\core\\lib\\security\\transport\\security_handshaker.cc " +
    "src\\core\\lib\\security\\transport\\server_auth_filter.cc " +
    "src\\core\\lib\\security\\transport\\target_authority_table.cc " +
    "src\\core\\lib\\security\\transport\\tsi_error.cc " +
    "src\\core\\lib\\security\\util\\json_util.cc " +
    "src\\core\\lib\\surface\\init_secure.cc " +
-    "src\\core\\tsi\\alts_transport_security.cc " +
+    "src\\core\\tsi\\alts\\crypt\\aes_gcm.cc " +
-    "src\\core\\tsi\\fake_transport_security.cc " +
+    "src\\core\\tsi\\alts\\crypt\\gsec.cc " +
-    "src\\core\\tsi\\ssl_transport_security.cc " +
+    "src\\core\\tsi\\alts\\frame_protector\\alts_counter.cc " +
-    "src\\core\\tsi\\transport_security_grpc.cc " +
+    "src\\core\\tsi\\alts\\frame_protector\\alts_crypter.cc " +
    "src\\core\\tsi\\alts\\frame_protector\\alts_frame_protector.cc " +
    "src\\core\\tsi\\alts\\frame_protector\\alts_record_protocol_crypter_common.cc " +
    "src\\core\\tsi\\alts\\frame_protector\\alts_seal_privacy_integrity_crypter.cc " +
    "src\\core\\tsi\\alts\\frame_protector\\alts_unseal_privacy_integrity_crypter.cc " +
    "src\\core\\tsi\\alts\\frame_protector\\frame_handler.cc " +
    "src\\core\\tsi\\alts\\handshaker\\alts_handshaker_client.cc " +
    "src\\core\\tsi\\alts\\handshaker\\alts_tsi_event.cc " +
    "src\\core\\tsi\\alts\\handshaker\\alts_tsi_handshaker.cc " +
    "src\\core\\tsi\\alts\\zero_copy_frame_protector\\alts_grpc_integrity_only_record_protocol.cc " +
    "src\\core\\tsi\\alts\\zero_copy_frame_protector\\alts_grpc_privacy_integrity_record_protocol.cc " +
    "src\\core\\tsi\\alts\\zero_copy_frame_protector\\alts_grpc_record_protocol_common.cc " +
    "src\\core\\tsi\\alts\\zero_copy_frame_protector\\alts_iovec_record_protocol.cc " +
    "src\\core\\tsi\\alts\\zero_copy_frame_protector\\alts_zero_copy_grpc_protector.cc " +
    "src\\core\\lib\\security\\credentials\\alts\\check_gcp_environment.cc " +
    "src\\core\\lib\\security\\credentials\\alts\\check_gcp_environment_linux.cc " +
    "src\\core\\lib\\security\\credentials\\alts\\check_gcp_environment_no_op.cc " +
    "src\\core\\lib\\security\\credentials\\alts\\check_gcp_environment_windows.cc " +
    "src\\core\\lib\\security\\credentials\\alts\\grpc_alts_credentials_client_options.cc " +
    "src\\core\\lib\\security\\credentials\\alts\\grpc_alts_credentials_options.cc " +
    "src\\core\\lib\\security\\credentials\\alts\\grpc_alts_credentials_server_options.cc " +
    "src\\core\\tsi\\alts\\handshaker\\alts_handshaker_service_api.cc " +
    "src\\core\\tsi\\alts\\handshaker\\alts_handshaker_service_api_util.cc " +
    "src\\core\\tsi\\alts\\handshaker\\alts_tsi_utils.cc " +
    "src\\core\\tsi\\alts\\handshaker\\transport_security_common_api.cc " +
    "src\\core\\tsi\\alts\\handshaker\\altscontext.pb.c " +
    "src\\core\\tsi\\alts\\handshaker\\handshaker.pb.c " +
    "src\\core\\tsi\\alts\\handshaker\\transport_security_common.pb.c " +
    "third_party\\nanopb\\pb_common.c " +
    "third_party\\nanopb\\pb_decode.c " +
    "third_party\\nanopb\\pb_encode.c " +
    "src\\core\\tsi\\transport_security.cc " +
    "src\\core\\tsi\\transport_security_adapter.cc " +
-    "src\\core\\ext\\transport\\chttp2\\server\\chttp2_server.cc " +
+    "src\\core\\ext\\transport\\chttp2\\client\\insecure\\channel_create.cc " +
-    "src\\core\\ext\\transport\\chttp2\\client\\secure\\secure_channel_create.cc " +
+    "src\\core\\ext\\transport\\chttp2\\client\\insecure\\channel_create_posix.cc " +
    "src\\core\\ext\\transport\\chttp2\\client\\chttp2_connector.cc " +
    "src\\core\\ext\\filters\\client_channel\\backup_poller.cc " +
    "src\\core\\ext\\filters\\client_channel\\channel_connectivity.cc " +
    "src\\core\\ext\\filters\\client_channel\\client_channel.cc " +
@ -263,21 +295,26 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\client_channel\\lb_policy.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy_factory.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy_registry.cc " +
    "src\\core\\ext\\filters\\client_channel\\method_params.cc " +
    "src\\core\\ext\\filters\\client_channel\\parse_address.cc " +
    "src\\core\\ext\\filters\\client_channel\\proxy_mapper.cc " +
    "src\\core\\ext\\filters\\client_channel\\proxy_mapper_registry.cc " +
    "src\\core\\ext\\filters\\client_channel\\resolver.cc " +
    "src\\core\\ext\\filters\\client_channel\\resolver_registry.cc " +
    "src\\core\\ext\\filters\\client_channel\\retry_throttle.cc " +
    "src\\core\\ext\\filters\\client_channel\\status_util.cc " +
    "src\\core\\ext\\filters\\client_channel\\subchannel.cc " +
    "src\\core\\ext\\filters\\client_channel\\subchannel_index.cc " +
    "src\\core\\ext\\filters\\client_channel\\uri_parser.cc " +
    "src\\core\\ext\\filters\\deadline\\deadline_filter.cc " +
-    "src\\core\\ext\\transport\\chttp2\\client\\chttp2_connector.cc " +
+    "src\\core\\tsi\\alts_transport_security.cc " +
    "src\\core\\tsi\\fake_transport_security.cc " +
    "src\\core\\tsi\\ssl_transport_security.cc " +
    "src\\core\\tsi\\transport_security_grpc.cc " +
    "src\\core\\ext\\transport\\chttp2\\server\\chttp2_server.cc " +
    "src\\core\\ext\\transport\\chttp2\\client\\secure\\secure_channel_create.cc " +
    "src\\core\\ext\\transport\\chttp2\\server\\insecure\\server_chttp2.cc " +
    "src\\core\\ext\\transport\\chttp2\\server\\insecure\\server_chttp2_posix.cc " +
    "src\\core\\ext\\transport\\chttp2\\client\\insecure\\channel_create.cc " +
    "src\\core\\ext\\transport\\chttp2\\client\\insecure\\channel_create_posix.cc " +
    "src\\core\\ext\\transport\\inproc\\inproc_plugin.cc " +
    "src\\core\\ext\\transport\\inproc\\inproc_transport.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\client_load_reporting_filter.cc " +
@ -286,9 +323,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\grpclb_client_stats.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\load_balancer_api.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\grpclb\\proto\\grpc\\lb\\v1\\load_balancer.pb.c " +
    "third_party\\nanopb\\pb_common.c " +
    "third_party\\nanopb\\pb_decode.c " +
    "third_party\\nanopb\\pb_encode.c " +
    "src\\core\\ext\\filters\\client_channel\\resolver\\fake\\fake_resolver.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\pick_first\\pick_first.cc " +
    "src\\core\\ext\\filters\\client_channel\\lb_policy\\subchannel_list.cc " +
@ -376,7 +410,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\crypto\\cpu-intel.c " +
    "third_party\\boringssl\\crypto\\cpu-ppc64le.c " +
    "third_party\\boringssl\\crypto\\crypto.c " +
    "third_party\\boringssl\\crypto\\curve25519\\curve25519.c " +
    "third_party\\boringssl\\crypto\\curve25519\\spake25519.c " +
    "third_party\\boringssl\\crypto\\curve25519\\x25519-x86_64.c " +
    "third_party\\boringssl\\crypto\\dh\\check.c " +
@ -562,6 +595,7 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl\\ssl\\tls13_server.cc " +
    "third_party\\boringssl\\ssl\\tls_method.cc " +
    "third_party\\boringssl\\ssl\\tls_record.cc " +
    "third_party\\boringssl\\third_party\\fiat\\curve25519.c " +
    "third_party\\zlib\\adler32.c " +
    "third_party\\zlib\\compress.c " +
    "third_party\\zlib\\crc32.c " +
@ -639,6 +673,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\compression");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\debug");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\http");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\json");
@ -646,6 +681,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\context");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\alts");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\composite");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\fake");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\google_default");
@ -654,6 +690,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\oauth2");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\plugin");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\ssl");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\security_connector");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\transport");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\util");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\slice");
@ -661,6 +698,11 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\transport");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\plugin_registry");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts\\crypt");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts\\frame_protector");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts\\handshaker");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts\\zero_copy_frame_protector");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php\\ext");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php\\ext\\grpc");
@ -703,6 +745,8 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\x509");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\crypto\\x509v3");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\ssl");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\third_party");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\third_party\\fiat");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\nanopb");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\zlib");
  _build_dirs = new Array();
--- a/doc/PROTOCOL-HTTP2.md
+++ b/doc/PROTOCOL-HTTP2.md
@ -191,7 +191,7 @@ grpc-java-android/0.9.1 (gingerbread/1.2.4; nexus5; tmobile)
 Unless explicitly defined to be, gRPC Calls are not assumed to be idempotent.  Specifically:
 * Calls that cannot be proven to have started will not be retried.
-* There is no mechanisim for duplicate suppression as it is not necessary.
+* There is no mechanism for duplicate suppression as it is not necessary.
 * Calls that are marked as idempotent may be sent multiple times.
--- a/doc/g_stands_for.md
+++ b/doc/g_stands_for.md
@ -14,3 +14,4 @@ future), and the corresponding version numbers that used them:
 - 1.8 'g' stands for 'generous'
 - 1.9 'g' stands for 'glossy'
 - 1.10 'g' stands for 'glamorous'
 - 1.11 'g' stands for 'gorgeous'
--- a/examples/android/helloworld/.gitignore
+++ b/examples/android/helloworld/.gitignore
@ -0,0 +1,9 @@
 *.iml
 .gradle
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
 .DS_Store
 /build
 /captures
 .externalNativeBuild
--- a/examples/android/helloworld/README.md
+++ b/examples/android/helloworld/README.md
@ -0,0 +1,24 @@
 gRPC on Android
 ==============
 Note: Building the protobuf dependency for Android requires
 https://github.com/google/protobuf/pull/3878. This fix will be in the next
 protobuf release, but until then must be manually patched in to
 `third_party/protobuf` to build gRPC for Android.
 PREREQUISITES
 -------------
 - Android SDK
 - Android NDK
 - `protoc` and `grpc_cpp_plugin` binaries on the host system
 INSTALL
 -------
 The example application can be built via Android Studio or on the command line
 using `gradle`:
  ```sh
  $ ./gradlew installDebug
  ```
--- a/examples/android/helloworld/app/.gitignore
+++ b/examples/android/helloworld/app/.gitignore
@ -0,0 +1 @@
 /build
--- a/examples/android/helloworld/app/CMakeLists.txt
+++ b/examples/android/helloworld/app/CMakeLists.txt
@ -0,0 +1,123 @@
 cmake_minimum_required(VERSION 3.4.1)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 set(helloworld_PROTOBUF_PROTOC_EXECUTABLE "/usr/local/bin/protoc" CACHE STRING "Protoc binary on host")
 set(helloworld_GRPC_CPP_PLUGIN_EXECUTABLE "/usr/local/bin/grpc_cpp_plugin" CACHE STRING "gRPC CPP plugin binary on host")
 set(GRPC_SRC_DIR ../../../../)
 set(GRPC_BUILD_DIR ../grpc/outputs/${ANDROID_ABI})
 file(MAKE_DIRECTORY ${GRPC_BUILD_DIR})
 add_subdirectory(${GRPC_SRC_DIR} ${GRPC_BUILD_DIR})
 include_directories(${GRPC_SRC_DIR}/include)
 add_library(libgrpc STATIC IMPORTED)
 set_target_properties(libgrpc PROPERTIES IMPORTED_LOCATION
  ${GRPC_BUILD_DIR}/libgrpc.a)
 add_library(libgrpc++ STATIC IMPORTED)
 set_target_properties(libgrpc++ PROPERTIES IMPORTED_LOCATION
  ${GRPC_BUILD_DIR}/libgrpc++.a)
 add_library(libgpr STATIC IMPORTED)
 set_target_properties(libgpr PROPERTIES IMPORTED_LOCATION
  ${GRPC_BUILD_DIR}/libgpr.a)
 add_library(libcares STATIC IMPORTED)
 set_target_properties(libcares PROPERTIES IMPORTED_LOCATION
  ${GRPC_BUILD_DIR}/third_party/cares/cares/lib/libcares.a)
 add_library(libzlib STATIC IMPORTED)
 set_target_properties(libzlib PROPERTIES IMPORTED_LOCATION
  ${GRPC_BUILD_DIR}/third_party/zlib/libz.a)
 add_library(libcrypto STATIC IMPORTED)
 set_target_properties(libcrypto PROPERTIES IMPORTED_LOCATION
  ${GRPC_BUILD_DIR}/third_party/boringssl/crypto/libcrypto.a)
 add_library(libssl STATIC IMPORTED)
 set_target_properties(libssl PROPERTIES IMPORTED_LOCATION
  ${GRPC_BUILD_DIR}/third_party/boringssl/ssl/libssl.a)
 set(GRPC_PROTO_GENS_DIR ${CMAKE_BINARY_DIR}/gens)
 file(MAKE_DIRECTORY ${GRPC_PROTO_GENS_DIR})
 include_directories(${GRPC_PROTO_GENS_DIR})
 function(android_protobuf_grpc_generate_cpp SRC_FILES HDR_FILES INCLUDE_ROOT)
  if(NOT ARGN)
    message(SEND_ERROR "Error: android_protobuf_grpc_generate_cpp() called without any proto files")
    return()
  endif()
  set(${SRC_FILES})
  set(${HDR_FILES})
  set(PROTOBUF_INCLUDE_PATH -I ${INCLUDE_ROOT})
  foreach(FIL ${ARGN})
    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
    get_filename_component(FIL_WE ${FIL} NAME_WE)
    file(RELATIVE_PATH REL_FIL ${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_ROOT} ${ABS_FIL})
    get_filename_component(REL_DIR ${REL_FIL} DIRECTORY)
    set(RELFIL_WE "${REL_DIR}/${FIL_WE}")
    list(APPEND ${SRC_FILES} "${GRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc")
    list(APPEND ${HDR_FILES} "${GRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h")
    list(APPEND ${SRC_FILES} "${GRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.cc")
    list(APPEND ${HDR_FILES} "${GRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h")
    add_custom_command(
      OUTPUT "${GRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.cc"
             "${GRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h"
             "${GRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc"
             "${GRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h"
      COMMAND ${helloworld_PROTOBUF_PROTOC_EXECUTABLE}
      ARGS --grpc_out=${GRPC_PROTO_GENS_DIR}
        --cpp_out=${GRPC_PROTO_GENS_DIR}
        --plugin=protoc-gen-grpc=${helloworld_GRPC_CPP_PLUGIN_EXECUTABLE}
        ${PROTOBUF_INCLUDE_PATH}
        ${REL_FIL}
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
      DEPENDS ${helloworld_PROTOBUF_PROTOC_EXECUTABLE} ${helloworld_GRPC_CPP_PLUGIN_EXECUTABLE} ${ABS_FIL} )
  endforeach()
  set_source_files_properties(${${SRC_FILES}} ${${HDR_FILES}} PROPERTIES GENERATED TRUE)
  set(${SRC_FILES} ${${SRC_FILES}} PARENT_SCOPE)
  set(${HDR_FILES} ${${HDR_FILES}} PARENT_SCOPE)
 endfunction()
 set(PROTO_BASE_DIR ${GRPC_SRC_DIR}/examples/protos)
 android_protobuf_grpc_generate_cpp(
  HELLOWORLD_PROTO_SRCS HELLOWORLD_PROTO_HDRS ${PROTO_BASE_DIR} ${PROTO_BASE_DIR}/helloworld.proto)
 add_library(helloworld_proto_lib
  SHARED ${HELLOWORLD_PROTO_HDRS} ${HELLOWORLD_PROTO_SRCS})
 target_link_libraries(helloworld_proto_lib
  libprotobuf
  libgrpc++
  android
  log)
 find_library(log-lib
 log)
 add_library(grpc-helloworld
  SHARED src/main/cpp/grpc-helloworld.cc)
 target_include_directories(grpc-helloworld
  PRIVATE ${HELLOWORLD_PROTO_HEADERS})
 target_link_libraries(grpc-helloworld
  libgrpc++
  libgrpc
  libzlib
  libcares
  libssl
  libcrypto
  helloworld_proto_lib
  libgpr
  android
  ${log-lib})
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@ -0,0 +1,53 @@
 apply plugin: 'com.android.application'
 android {
    compileSdkVersion 26
    defaultConfig {
        applicationId "io.grpc.android.cpp.helloworldexample"
        minSdkVersion 14
        targetSdkVersion 26
        versionCode 1
        versionName "1.0"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
            cmake {
                cppFlags "-std=c++14 -frtti -fexceptions"
                arguments '-DANDROID_STL=c++_static'
                arguments '-DRUN_HAVE_POSIX_REGEX=0'
                arguments '-DRUN_HAVE_STD_REGEX=0'
                arguments '-DRUN_HAVE_STEADY_CLOCK=0'
                arguments '-Dprotobuf_BUILD_PROTOC_BINARIES=off'
                arguments '-DgRPC_BUILD_CODEGEN=off'
                // Set this to the path to the protoc binary on the host system (codegen is not
                // cross-compiled to Android)
                arguments '-Dhelloworld_PROTOBUF_PROTOC_EXECUTABLE=/usr/local/bin/protoc'
                // Set this to the path to the gRPC C++ protoc plugin binary on the host system
                // (codegen is not cross-compiled to Android)
                arguments '-Dhelloworld_GRPC_CPP_PLUGIN_EXECUTABLE=/usr/local/bin/grpc_cpp_plugin'
            }
        }
        ndk.abiFilters 'x86'
    }
    buildTypes {
        debug {
            minifyEnabled false
        }
        release {
            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
    externalNativeBuild {
        cmake {
            path "CMakeLists.txt"
        }
    }
 }
 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation 'com.android.support:appcompat-v7:26.1.0'
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'com.android.support.test:runner:1.0.1'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
 }
--- a/examples/android/helloworld/app/proguard-rules.pro
+++ b/examples/android/helloworld/app/proguard-rules.pro
@ -0,0 +1,21 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
 # proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
 #-keepattributes SourceFile,LineNumberTable
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--- a/examples/android/helloworld/app/src/main/AndroidManifest.xml
+++ b/examples/android/helloworld/app/src/main/AndroidManifest.xml
@ -0,0 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="io.grpc.helloworldexample.cpp" >
    <uses-permission android:name="android.permission.INTERNET" />
    <application
        android:allowBackup="false"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:theme="@style/Base.V7.Theme.AppCompat.Light" >
        <activity
            android:name=".HelloworldActivity"
            android:label="@string/app_name" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
    </application>
 </manifest>
--- a/examples/android/helloworld/app/src/main/cpp/grpc-helloworld.cc
+++ b/examples/android/helloworld/app/src/main/cpp/grpc-helloworld.cc
@ -0,0 +1,142 @@
 /*
 *
 * Copyright 2018 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 #include <atomic>
 #include <grpc++/grpc++.h>
 #include <jni.h>
 #include "helloworld.grpc.pb.h"
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerContext;
 using grpc::Status;
 using helloworld::Greeter;
 using helloworld::HelloReply;
 using helloworld::HelloRequest;
 std::atomic<bool> stop_server(false);
 // Logic and data behind the server's behavior.
 class GreeterServiceImpl final : public Greeter::Service {
  Status SayHello(ServerContext* context, const HelloRequest* request,
                  HelloReply* reply) override {
    std::string prefix("Hello ");
    reply->set_message(prefix + request->name());
    return Status::OK;
  }
 };
 void StartServer(JNIEnv* env, jobject obj, jmethodID is_cancelled_mid,
                 int port) {
  const int host_port_buf_size = 1024;
  char host_port[host_port_buf_size];
  snprintf(host_port, host_port_buf_size, "0.0.0.0:%d", port);
  GreeterServiceImpl service;
  ServerBuilder builder;
  // Listen on the given address without any authentication mechanism.
  builder.AddListeningPort(host_port, grpc::InsecureServerCredentials());
  // Register "service" as the instance through which we'll communicate with
  // clients. In this case it corresponds to an *synchronous* service.
  builder.RegisterService(&service);
  // Finally assemble the server.
  std::unique_ptr<Server> server(builder.BuildAndStart());
  while (!stop_server.load()) {
    // Check with the Java code to see if the user has requested the server stop or the app is no
    // longer in the foreground.
    jboolean is_cancelled = env->CallBooleanMethod(obj, is_cancelled_mid);
    if (is_cancelled == JNI_TRUE) {
      stop_server = true;
    }
  }
 }
 class GreeterClient {
 public:
  GreeterClient(std::shared_ptr<Channel> channel)
      : stub_(Greeter::NewStub(channel)) {}
  // Assembles the client's payload, sends it and presents the response back
  // from the server.
  std::string SayHello(const std::string& user) {
    // Data we are sending to the server.
    HelloRequest request;
    request.set_name(user);
    // Container for the data we expect from the server.
    HelloReply reply;
    // Context for the client. It could be used to convey extra information to
    // the server and/or tweak certain RPC behaviors.
    ClientContext context;
    // The actual RPC.
    Status status = stub_->SayHello(&context, request, &reply);
    if (status.ok()) {
      return reply.message();
    } else {
      return status.error_message();
    }
  }
 private:
  std::unique_ptr<Greeter::Stub> stub_;
 };
 // Send an RPC and return the response. Invoked from Java code.
 extern "C" JNIEXPORT jstring JNICALL
 Java_io_grpc_helloworldexample_cpp_HelloworldActivity_sayHello(
    JNIEnv* env, jobject obj_unused, jstring host_raw, jint port_raw,
    jstring message_raw) {
  const char* host_chars = env->GetStringUTFChars(host_raw, (jboolean*)0);
  std::string host(host_chars, env->GetStringUTFLength(host_raw));
  int port = static_cast<int>(port_raw);
  const char* message_chars = env->GetStringUTFChars(message_raw, (jboolean*)0);
  std::string message(message_chars, env->GetStringUTFLength(message_raw));
  const int host_port_buf_size = 1024;
  char host_port[host_port_buf_size];
  snprintf(host_port, host_port_buf_size, "%s:%d", host.c_str(), port);
  GreeterClient greeter(
      grpc::CreateChannel(host_port, grpc::InsecureChannelCredentials()));
  std::string reply = greeter.SayHello(message);
  return env->NewStringUTF(reply.c_str());
 }
 // Start the server. Invoked from Java code.
 extern "C" JNIEXPORT void JNICALL
 Java_io_grpc_helloworldexample_cpp_HelloworldActivity_startServer(
    JNIEnv* env, jobject obj_this, jint port_raw) {
  int port = static_cast<int>(port_raw);
  jclass cls = env->GetObjectClass(obj_this);
  jmethodID is_cancelled_mid =
      env->GetMethodID(cls, "isRunServerTaskCancelled", "()Z");
  stop_server = false;
  StartServer(env, obj_this, is_cancelled_mid, port);
 }
--- a/examples/android/helloworld/app/src/main/java/io/grpc/helloworldexample/cpp/HelloworldActivity.java
+++ b/examples/android/helloworld/app/src/main/java/io/grpc/helloworldexample/cpp/HelloworldActivity.java
@ -0,0 +1,167 @@
 /*
 * Copyright 2018, gRPC Authors All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package io.grpc.helloworldexample.cpp;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 import java.lang.ref.WeakReference;
 public class HelloworldActivity extends AppCompatActivity {
  static {
    System.loadLibrary("grpc-helloworld");
  }
  private Button sendButton;
  private Button serverButton;
  private EditText hostEdit;
  private EditText portEdit;
  private EditText messageEdit;
  private EditText serverPortEdit;
  private TextView resultText;
  private GrpcTask grpcTask;
  private RunServerTask runServerTask;
  @Override
  protected void onCreate(Bundle savedInstanceState) {
    super.onCreate(savedInstanceState);
    setContentView(R.layout.activity_helloworld);
    sendButton = (Button) findViewById(R.id.send_button);
    serverButton = (Button) findViewById(R.id.server_button);
    hostEdit = (EditText) findViewById(R.id.host_edit_text);
    portEdit = (EditText) findViewById(R.id.port_edit_text);
    messageEdit = (EditText) findViewById(R.id.message_edit_text);
    serverPortEdit = (EditText) findViewById(R.id.server_port_edit_text);
    resultText = (TextView) findViewById(R.id.grpc_response_text);
    resultText.setMovementMethod(new ScrollingMovementMethod());
  }
  @Override
  protected void onPause() {
    super.onPause();
    if (runServerTask != null) {
      runServerTask.cancel(true);
      runServerTask = null;
      serverButton.setText("Start gRPC Server");
    }
    if (grpcTask != null) {
      grpcTask.cancel(true);
      grpcTask = null;
    }
  }
  public void sendMessage(View view) {
    ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
        .hideSoftInputFromWindow(hostEdit.getWindowToken(), 0);
    sendButton.setEnabled(false);
    resultText.setText("");
    grpcTask = new GrpcTask(this);
    grpcTask.executeOnExecutor(
        AsyncTask.THREAD_POOL_EXECUTOR,
        hostEdit.getText().toString(),
        messageEdit.getText().toString(),
        portEdit.getText().toString());
  }
  public void startOrStopServer(View view) {
    if (runServerTask != null) {
      runServerTask.cancel(true);
      runServerTask = null;
      serverButton.setText("Start gRPC Server");
      Toast.makeText(this, "Server stopped", Toast.LENGTH_SHORT).show();
    } else {
      runServerTask = new RunServerTask(this);
      String portStr = serverPortEdit.getText().toString();
      int port = TextUtils.isEmpty(portStr) ? 50051 : Integer.valueOf(portStr);
      runServerTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, port);
      serverButton.setText("Stop gRPC Server");
      Toast.makeText(this, "Server started on port " + port, Toast.LENGTH_SHORT).show();
    }
  }
  private static class RunServerTask extends AsyncTask<Integer, Void, Void> {
    private final WeakReference<HelloworldActivity> activityReference;
    private RunServerTask(HelloworldActivity activity) {
      this.activityReference = new WeakReference<HelloworldActivity>(activity);
    }
    @Override
    protected Void doInBackground(Integer... params) {
      int port = params[0];
      HelloworldActivity activity = activityReference.get();
      if (activity != null) {
        activity.startServer(port);
      }
      return null;
    }
  }
  private static class GrpcTask extends AsyncTask<String, Void, String> {
    private final WeakReference<HelloworldActivity> activityReference;
    private GrpcTask(HelloworldActivity activity) {
      this.activityReference = new WeakReference<HelloworldActivity>(activity);
    }
    @Override
    protected String doInBackground(String... params) {
      String host = params[0];
      String message = params[1];
      String portStr = params[2];
      int port = TextUtils.isEmpty(portStr) ? 50051 : Integer.valueOf(portStr);
      return sayHello(host, port, message);
    }
    @Override
    protected void onPostExecute(String result) {
      HelloworldActivity activity = activityReference.get();
      if (activity == null || isCancelled()) {
        return;
      }
      TextView resultText = (TextView) activity.findViewById(R.id.grpc_response_text);
      Button sendButton = (Button) activity.findViewById(R.id.send_button);
      resultText.setText(result);
      sendButton.setEnabled(true);
    }
  }
  /**
   * Invoked by native code to stop server when RunServerTask has been canceled, either by user
   * request or upon app moving to background.
   */
  public boolean isRunServerTaskCancelled() {
    if (runServerTask != null) {
      return runServerTask.isCancelled();
    }
    return false;
  }
  public static native String sayHello(String host, int port, String message);
  public native void startServer(int port);
 }
--- a/examples/android/helloworld/app/src/main/res/layout/activity_helloworld.xml
+++ b/examples/android/helloworld/app/src/main/res/layout/activity_helloworld.xml
@ -0,0 +1,86 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
              android:layout_height="match_parent"
              tools:context=".HelloworldActivity"
              android:orientation="vertical" >
    <TextView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="12dp"
        android:paddingBottom="12dp"
        android:textSize="16sp"
        android:text="gRPC Client Configuration"
        android:textStyle="bold" />
    <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal">
        <EditText
                android:id="@+id/host_edit_text"
                android:layout_weight="2"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:hint="Enter Host" />
        <EditText
                android:id="@+id/port_edit_text"
                android:layout_weight="1"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:inputType="numberDecimal"
                android:hint="Enter Port" />
    </LinearLayout>
    <EditText
            android:id="@+id/message_edit_text"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:hint="Enter message to send" />
    <Button
            android:id="@+id/send_button"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:onClick="sendMessage"
            android:text="Send gRPC Request" />
    <TextView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="12dp"
        android:paddingBottom="12dp"
        android:textSize="16sp"
        android:text="Response:" />
    <TextView
        android:id="@+id/grpc_response_text"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:scrollbars = "vertical"
        android:textSize="16sp" />
    <TextView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="12dp"
        android:paddingBottom="12dp"
        android:textSize="16sp"
        android:text="gRPC Server Configuration"
        android:textStyle="bold" />
    <EditText
        android:id="@+id/server_port_edit_text"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:hint="Server port" />
    <Button
        android:id="@+id/server_button"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:onClick="startOrStopServer"
        android:text="Start gRPC Server" />
 </LinearLayout>
--- a/examples/android/helloworld/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/examples/android/helloworld/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/examples/android/helloworld/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/examples/android/helloworld/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/examples/android/helloworld/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/examples/android/helloworld/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/examples/android/helloworld/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/examples/android/helloworld/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/examples/android/helloworld/app/src/main/res/values/strings.xml
+++ b/examples/android/helloworld/app/src/main/res/values/strings.xml
@ -0,0 +1,3 @@
 <resources>
    <string name="app_name">GrpcHelloworldCppExample</string>
 </resources>
--- a/examples/android/helloworld/build.gradle
+++ b/examples/android/helloworld/build.gradle
@ -0,0 +1,24 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
    repositories {
        google()
        jcenter()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:3.0.1'
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
    }
 }
 allprojects {
    repositories {
        google()
        jcenter()
    }
 }
 task clean(type: Delete) {
    delete rootProject.buildDir
 }
--- a/examples/android/helloworld/gradle.properties
+++ b/examples/android/helloworld/gradle.properties
@ -0,0 +1,17 @@
 # Project-wide Gradle settings.
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
--- a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar
+++ b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar
--- a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,6 @@
 #Thu Jan 25 11:45:30 PST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
--- a/examples/android/helloworld/gradlew
+++ b/examples/android/helloworld/gradlew
@ -0,0 +1,160 @@
 #!/usr/bin/env bash
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS=""
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 warn ( ) {
    echo "$*"
 }
 die ( ) {
    echo
    echo "$*"
    echo
    exit 1
 }
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 case "`uname`" in
  CYGWIN* )
    cygwin=true
    ;;
  Darwin* )
    darwin=true
    ;;
  MINGW* )
    msys=true
    ;;
 esac
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
 # Need this for relative symlinks.
 while [ -h "$PRG" ] ; do
    ls=`ls -ld "$PRG"`
    link=`expr "$ls" : '.*-> \(.*\)$'`
    if expr "$link" : '/.*' > /dev/null; then
        PRG="$link"
    else
        PRG=`dirname "$PRG"`"/$link"
    fi
 done
 SAVED="`pwd`"
 cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
 # Increase the maximum file descriptors if we can.
 if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
            MAX_FD="$MAX_FD_LIMIT"
        fi
        ulimit -n $MAX_FD
        if [ $? -ne 0 ] ; then
            warn "Could not set maximum file descriptor limit: $MAX_FD"
        fi
    else
        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
    fi
 fi
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`
    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
    SEP=""
    for dir in $ROOTDIRSRAW ; do
        ROOTDIRS="$ROOTDIRS$SEP$dir"
        SEP="|"
    done
    OURCYGPATTERN="(^($ROOTDIRS))"
    # Add a user-defined pattern to the cygpath arguments
    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
    fi
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    i=0
    for arg in "$@" ; do
        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
        else
            eval `echo args$i`="\"$arg\""
        fi
        i=$((i+1))
    done
    case $i in
        (0) set -- ;;
        (1) set -- "$args0" ;;
        (2) set -- "$args0" "$args1" ;;
        (3) set -- "$args0" "$args1" "$args2" ;;
        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi
 # Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
 function splitJvmOpts() {
    JVM_OPTS=("$@")
 }
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
--- a/examples/android/helloworld/gradlew.bat
+++ b/examples/android/helloworld/gradlew.bat
@ -0,0 +1,90 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS=
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if "%ERRORLEVEL%" == "0" goto init
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
 goto fail
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 if exist "%JAVA_EXE%" goto init
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation.
 goto fail
 :init
@rem Get command-line arguments, handling Windowz variants
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
 :win9xME_args
@rem Slurp the command line arguments.
 set CMD_LINE_ARGS=
 set _SKIP=2
 :win9xME_args_slurp
 if "x%~1" == "x" goto execute
 set CMD_LINE_ARGS=%*
 goto execute
 :4NT_args
@rem Get arguments from the 4NT Shell from JP Software
 set CMD_LINE_ARGS=%$
 :execute
@rem Setup the command line
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 :end
@rem End local scope for the variables with windows NT shell
 if "%ERRORLEVEL%"=="0" goto mainEnd
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
 if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
 exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 :omega
--- a/examples/android/helloworld/settings.gradle
+++ b/examples/android/helloworld/settings.gradle
@ -0,0 +1 @@
 include ':app'
--- a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.mm
+++ b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.mm
@ -17,9 +17,9 @@
 */
 #import "ViewController.h"
-#import <grpc++/grpc++.h>
+#import <grpcpp/grpcpp.h>
-#include <grpc++/generic/generic_stub.h>
+#include <grpcpp/generic/generic_stub.h>
-#include <grpc++/generic/async_generic_service.h>
+#include <grpcpp/generic/async_generic_service.h>
 static void* tag(int i) { return (void*)(intptr_t)i; }
--- a/examples/cpp/helloworld/greeter_async_client.cc
+++ b/examples/cpp/helloworld/greeter_async_client.cc
@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 #include <grpc/support/log.h>
 #include "helloworld.grpc.pb.h"
--- a/examples/cpp/helloworld/greeter_async_client2.cc
+++ b/examples/cpp/helloworld/greeter_async_client2.cc
@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 #include <grpc/support/log.h>
 #include <thread>
--- a/examples/cpp/helloworld/greeter_async_server.cc
+++ b/examples/cpp/helloworld/greeter_async_server.cc
@ -21,7 +21,7 @@
 #include <string>
 #include <thread>
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 #include <grpc/support/log.h>
 #include "helloworld.grpc.pb.h"
--- a/examples/cpp/helloworld/greeter_client.cc
+++ b/examples/cpp/helloworld/greeter_client.cc
@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
--- a/examples/cpp/helloworld/greeter_server.cc
+++ b/examples/cpp/helloworld/greeter_server.cc
@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
--- a/examples/cpp/route_guide/route_guide_client.cc
+++ b/examples/cpp/route_guide/route_guide_client.cc
@ -24,10 +24,10 @@
 #include <thread>
 #include <grpc/grpc.h>
-#include <grpc++/channel.h>
+#include <grpcpp/channel.h>
-#include <grpc++/client_context.h>
+#include <grpcpp/client_context.h>
-#include <grpc++/create_channel.h>
+#include <grpcpp/create_channel.h>
-#include <grpc++/security/credentials.h>
+#include <grpcpp/security/credentials.h>
 #include "helper.h"
 #include "route_guide.grpc.pb.h"
--- a/examples/cpp/route_guide/route_guide_server.cc
+++ b/examples/cpp/route_guide/route_guide_server.cc
@ -24,10 +24,10 @@
 #include <string>
 #include <grpc/grpc.h>
-#include <grpc++/server.h>
+#include <grpcpp/server.h>
-#include <grpc++/server_builder.h>
+#include <grpcpp/server_builder.h>
-#include <grpc++/server_context.h>
+#include <grpcpp/server_context.h>
-#include <grpc++/security/server_credentials.h>
+#include <grpcpp/security/server_credentials.h>
 #include "helper.h"
 #include "route_guide.grpc.pb.h"
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -23,15 +23,15 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-C++'
  # TODO (mxyan): use version that match gRPC version when pod is stabilized
-  # version = '1.10.0-dev'
+  # version = '1.11.0-dev'
-  version = '0.0.1'
+  version = '0.0.2'
  s.version  = version
  s.summary  = 'gRPC C++ library'
  s.homepage = 'https://grpc.io'
  s.license  = 'Apache License, Version 2.0'
  s.authors  = { 'The gRPC contributors' => 'grpc-packages@google.com' }
-  grpc_version = '1.10.0-dev'
+  grpc_version = '1.11.0-dev'
  s.source = {
    :git => 'https://github.com/grpc/grpc.git',
@ -42,8 +42,14 @@ Pod::Spec.new do |s|
  s.osx.deployment_target = '10.9'
  s.requires_arc = false
-  # Add include prefix `grpc++` (i.e. `#include <grpc++/xxx.h>`).
+  name = 'grpcpp'
-  s.header_dir = 'grpc++'
+  # Use `grpcpp` as framework name so that `#include <grpcpp/xxx.h>` works when built as
  # framework.
  s.module_name = name
  # Add include prefix `grpcpp` so that `#include <grpcpp/xxx.h>` works when built as static
  # library.
  s.header_dir = name
  s.pod_target_xcconfig = {
    'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"',
@ -63,55 +69,12 @@ Pod::Spec.new do |s|
  s.default_subspecs = 'Interface', 'Implementation'
  s.header_mappings_dir = 'include/grpcpp'
  s.subspec 'Interface' do |ss|
-    ss.header_mappings_dir = 'include/grpc++'
+    ss.header_mappings_dir = 'include/grpcpp'
-    ss.source_files = 'include/grpc++/alarm.h',
+    ss.source_files = 'include/grpcpp/alarm.h',
                      'include/grpc++/channel.h',
                      'include/grpc++/client_context.h',
                      'include/grpc++/completion_queue.h',
                      'include/grpc++/create_channel.h',
                      'include/grpc++/create_channel_posix.h',
                      'include/grpc++/ext/health_check_service_server_builder_option.h',
                      'include/grpc++/generic/async_generic_service.h',
                      'include/grpc++/generic/generic_stub.h',
                      'include/grpc++/grpc++.h',
                      'include/grpc++/health_check_service_interface.h',
                      'include/grpc++/impl/call.h',
                      'include/grpc++/impl/channel_argument_option.h',
                      'include/grpc++/impl/client_unary_call.h',
                      'include/grpc++/impl/codegen/core_codegen.h',
                      'include/grpc++/impl/grpc_library.h',
                      'include/grpc++/impl/method_handler_impl.h',
                      'include/grpc++/impl/rpc_method.h',
                      'include/grpc++/impl/rpc_service_method.h',
                      'include/grpc++/impl/serialization_traits.h',
                      'include/grpc++/impl/server_builder_option.h',
                      'include/grpc++/impl/server_builder_plugin.h',
                      'include/grpc++/impl/server_initializer.h',
                      'include/grpc++/impl/service_type.h',
                      'include/grpc++/resource_quota.h',
                      'include/grpc++/security/auth_context.h',
                      'include/grpc++/security/auth_metadata_processor.h',
                      'include/grpc++/security/credentials.h',
                      'include/grpc++/security/server_credentials.h',
                      'include/grpc++/server.h',
                      'include/grpc++/server_builder.h',
                      'include/grpc++/server_context.h',
                      'include/grpc++/server_posix.h',
                      'include/grpc++/support/async_stream.h',
                      'include/grpc++/support/async_unary_call.h',
                      'include/grpc++/support/byte_buffer.h',
                      'include/grpc++/support/channel_arguments.h',
                      'include/grpc++/support/config.h',
                      'include/grpc++/support/slice.h',
                      'include/grpc++/support/status.h',
                      'include/grpc++/support/status_code_enum.h',
                      'include/grpc++/support/string_ref.h',
                      'include/grpc++/support/stub_options.h',
                      'include/grpc++/support/sync_stream.h',
                      'include/grpc++/support/time.h',
                      'include/grpcpp/alarm.h',
                      'include/grpcpp/channel.h',
                      'include/grpcpp/client_context.h',
                      'include/grpcpp/completion_queue.h',
@ -156,36 +119,6 @@ Pod::Spec.new do |s|
                      'include/grpcpp/support/stub_options.h',
                      'include/grpcpp/support/sync_stream.h',
                      'include/grpcpp/support/time.h',
                      'include/grpc++/impl/codegen/async_stream.h',
                      'include/grpc++/impl/codegen/async_unary_call.h',
                      'include/grpc++/impl/codegen/byte_buffer.h',
                      'include/grpc++/impl/codegen/call.h',
                      'include/grpc++/impl/codegen/call_hook.h',
                      'include/grpc++/impl/codegen/channel_interface.h',
                      'include/grpc++/impl/codegen/client_context.h',
                      'include/grpc++/impl/codegen/client_unary_call.h',
                      'include/grpc++/impl/codegen/completion_queue.h',
                      'include/grpc++/impl/codegen/completion_queue_tag.h',
                      'include/grpc++/impl/codegen/config.h',
                      'include/grpc++/impl/codegen/core_codegen_interface.h',
                      'include/grpc++/impl/codegen/create_auth_context.h',
                      'include/grpc++/impl/codegen/grpc_library.h',
                      'include/grpc++/impl/codegen/metadata_map.h',
                      'include/grpc++/impl/codegen/method_handler_impl.h',
                      'include/grpc++/impl/codegen/rpc_method.h',
                      'include/grpc++/impl/codegen/rpc_service_method.h',
                      'include/grpc++/impl/codegen/security/auth_context.h',
                      'include/grpc++/impl/codegen/serialization_traits.h',
                      'include/grpc++/impl/codegen/server_context.h',
                      'include/grpc++/impl/codegen/server_interface.h',
                      'include/grpc++/impl/codegen/service_type.h',
                      'include/grpc++/impl/codegen/slice.h',
                      'include/grpc++/impl/codegen/status.h',
                      'include/grpc++/impl/codegen/status_code_enum.h',
                      'include/grpc++/impl/codegen/string_ref.h',
                      'include/grpc++/impl/codegen/stub_options.h',
                      'include/grpc++/impl/codegen/sync_stream.h',
                      'include/grpc++/impl/codegen/time.h',
                      'include/grpcpp/impl/codegen/async_stream.h',
                      'include/grpcpp/impl/codegen/async_unary_call.h',
                      'include/grpcpp/impl/codegen/byte_buffer.h',
@ -224,8 +157,7 @@ Pod::Spec.new do |s|
    ss.dependency 'gRPC-Core', grpc_version
    ss.dependency 'nanopb', '~> 0.3'
-    ss.source_files = 'include/grpc++/impl/codegen/core_codegen.h',
+    ss.source_files = 'include/grpcpp/impl/codegen/core_codegen.h',
                      'include/grpcpp/impl/codegen/core_codegen.h',
                      'src/cpp/client/secure_credentials.h',
                      'src/cpp/common/secure_auth_context.h',
                      'src/cpp/server/secure_server_credentials.h',
@ -288,7 +220,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/gpr/spinlock.h',
                      'src/core/lib/gpr/string.h',
                      'src/core/lib/gpr/string_windows.h',
                      'src/core/lib/gpr/thd.h',
                      'src/core/lib/gpr/time_precise.h',
                      'src/core/lib/gpr/tls.h',
                      'src/core/lib/gpr/tls_gcc.h',
@ -302,6 +233,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/gprpp/atomic_with_std.h',
                      'src/core/lib/gprpp/manual_constructor.h',
                      'src/core/lib/gprpp/memory.h',
                      'src/core/lib/gprpp/thd.h',
                      'src/core/lib/profiling/timers.h',
                      'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                      'src/core/ext/transport/chttp2/transport/bin_encoder.h',
@ -328,6 +260,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/http/message_compress/message_compress_filter.h',
                      'src/core/ext/filters/http/server/http_server_filter.h',
                      'src/core/lib/security/context/security_context.h',
                      'src/core/lib/security/credentials/alts/alts_credentials.h',
                      'src/core/lib/security/credentials/composite/composite_credentials.h',
                      'src/core/lib/security/credentials/credentials.h',
                      'src/core/lib/security/credentials/fake/fake_credentials.h',
@ -339,22 +272,43 @@ Pod::Spec.new do |s|
                      'src/core/lib/security/credentials/oauth2/oauth2_credentials.h',
                      'src/core/lib/security/credentials/plugin/plugin_credentials.h',
                      'src/core/lib/security/credentials/ssl/ssl_credentials.h',
                      'src/core/lib/security/security_connector/alts_security_connector.h',
                      'src/core/lib/security/security_connector/security_connector.h',
                      'src/core/lib/security/transport/auth_filters.h',
                      'src/core/lib/security/transport/lb_targets_info.h',
                      'src/core/lib/security/transport/secure_endpoint.h',
                      'src/core/lib/security/transport/security_connector.h',
                      'src/core/lib/security/transport/security_handshaker.h',
                      'src/core/lib/security/transport/target_authority_table.h',
                      'src/core/lib/security/transport/tsi_error.h',
                      'src/core/lib/security/util/json_util.h',
-                      'src/core/tsi/alts_transport_security.h',
+                      'src/core/tsi/alts/crypt/gsec.h',
-                      'src/core/tsi/fake_transport_security.h',
+                      'src/core/tsi/alts/frame_protector/alts_counter.h',
-                      'src/core/tsi/ssl_transport_security.h',
+                      'src/core/tsi/alts/frame_protector/alts_crypter.h',
-                      'src/core/tsi/ssl_types.h',
+                      'src/core/tsi/alts/frame_protector/alts_frame_protector.h',
-                      'src/core/tsi/transport_security_grpc.h',
+                      'src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h',
                      'src/core/tsi/alts/frame_protector/frame_handler.h',
                      'src/core/tsi/alts/handshaker/alts_handshaker_client.h',
                      'src/core/tsi/alts/handshaker/alts_tsi_event.h',
                      'src/core/tsi/alts/handshaker/alts_tsi_handshaker.h',
                      'src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h',
                      'src/core/lib/security/credentials/alts/check_gcp_environment.h',
                      'src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h',
                      'src/core/tsi/alts/handshaker/alts_handshaker_service_api.h',
                      'src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h',
                      'src/core/tsi/alts/handshaker/alts_tsi_utils.h',
                      'src/core/tsi/alts/handshaker/transport_security_common_api.h',
                      'src/core/tsi/alts/handshaker/altscontext.pb.h',
                      'src/core/tsi/alts/handshaker/handshaker.pb.h',
                      'src/core/tsi/alts/handshaker/transport_security_common.pb.h',
                      'src/core/tsi/transport_security.h',
                      'src/core/tsi/transport_security_adapter.h',
                      'src/core/tsi/transport_security_interface.h',
-                      'src/core/ext/transport/chttp2/server/chttp2_server.h',
+                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                      'src/core/ext/filters/client_channel/backup_poller.h',
                      'src/core/ext/filters/client_channel/client_channel.h',
                      'src/core/ext/filters/client_channel/client_channel_factory.h',
@ -364,6 +318,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/lb_policy.h',
                      'src/core/ext/filters/client_channel/lb_policy_factory.h',
                      'src/core/ext/filters/client_channel/lb_policy_registry.h',
                      'src/core/ext/filters/client_channel/method_params.h',
                      'src/core/ext/filters/client_channel/parse_address.h',
                      'src/core/ext/filters/client_channel/proxy_mapper.h',
                      'src/core/ext/filters/client_channel/proxy_mapper_registry.h',
@ -371,11 +326,17 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/resolver_factory.h',
                      'src/core/ext/filters/client_channel/resolver_registry.h',
                      'src/core/ext/filters/client_channel/retry_throttle.h',
                      'src/core/ext/filters/client_channel/status_util.h',
                      'src/core/ext/filters/client_channel/subchannel.h',
                      'src/core/ext/filters/client_channel/subchannel_index.h',
                      'src/core/ext/filters/client_channel/uri_parser.h',
                      'src/core/ext/filters/deadline/deadline_filter.h',
-                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
+                      'src/core/tsi/alts_transport_security.h',
                      'src/core/tsi/fake_transport_security.h',
                      'src/core/tsi/ssl_transport_security.h',
                      'src/core/tsi/ssl_types.h',
                      'src/core/tsi/transport_security_grpc.h',
                      'src/core/ext/transport/chttp2/server/chttp2_server.h',
                      'src/core/ext/transport/inproc/inproc_transport.h',
                      'src/core/lib/avl/avl.h',
                      'src/core/lib/backoff/backoff.h',
@ -475,6 +436,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/slice/slice_hash_table.h',
                      'src/core/lib/slice/slice_internal.h',
                      'src/core/lib/slice/slice_string_helpers.h',
                      'src/core/lib/slice/slice_weak_hash_table.h',
                      'src/core/lib/surface/api_trace.h',
                      'src/core/lib/surface/call.h',
                      'src/core/lib/surface/call_test_only.h',
@ -499,12 +461,12 @@ Pod::Spec.new do |s|
                      'src/core/lib/transport/service_config.h',
                      'src/core/lib/transport/static_metadata.h',
                      'src/core/lib/transport/status_conversion.h',
                      'src/core/lib/transport/status_metadata.h',
                      'src/core/lib/transport/timeout_encoding.h',
                      'src/core/lib/transport/transport.h',
                      'src/core/lib/transport/transport_impl.h',
                      'src/core/lib/debug/trace.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h',
@ -520,8 +482,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h',
                      'src/core/ext/filters/workarounds/workaround_utils.h'
-    ss.private_header_files = 'include/grpc++/impl/codegen/core_codegen.h',
+    ss.private_header_files = 'include/grpcpp/impl/codegen/core_codegen.h',
                              'include/grpcpp/impl/codegen/core_codegen.h',
                              'src/cpp/client/secure_credentials.h',
                              'src/cpp/common/secure_auth_context.h',
                              'src/cpp/server/secure_server_credentials.h',
@ -541,7 +502,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/gpr/spinlock.h',
                              'src/core/lib/gpr/string.h',
                              'src/core/lib/gpr/string_windows.h',
                              'src/core/lib/gpr/thd.h',
                              'src/core/lib/gpr/time_precise.h',
                              'src/core/lib/gpr/tls.h',
                              'src/core/lib/gpr/tls_gcc.h',
@ -555,6 +515,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/gprpp/atomic_with_std.h',
                              'src/core/lib/gprpp/manual_constructor.h',
                              'src/core/lib/gprpp/memory.h',
                              'src/core/lib/gprpp/thd.h',
                              'src/core/lib/profiling/timers.h',
                              'src/core/lib/avl/avl.h',
                              'src/core/lib/backoff/backoff.h',
@ -654,6 +615,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/slice/slice_hash_table.h',
                              'src/core/lib/slice/slice_internal.h',
                              'src/core/lib/slice/slice_string_helpers.h',
                              'src/core/lib/slice/slice_weak_hash_table.h',
                              'src/core/lib/surface/api_trace.h',
                              'src/core/lib/surface/call.h',
                              'src/core/lib/surface/call_test_only.h',
@ -678,6 +640,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/transport/service_config.h',
                              'src/core/lib/transport/static_metadata.h',
                              'src/core/lib/transport/status_conversion.h',
                              'src/core/lib/transport/status_metadata.h',
                              'src/core/lib/transport/timeout_encoding.h',
                              'src/core/lib/transport/transport.h',
                              'src/core/lib/transport/transport_impl.h',
@ -685,113 +648,6 @@ Pod::Spec.new do |s|
                              'src/core/ext/transport/inproc/inproc_transport.h'
  end
  s.subspec 'Tests' do |ss|
    ss.header_mappings_dir = '.'
    ss.dependency "#{s.name}/Interface", version
    ss.dependency "#{s.name}/Implementation", version
    ss.dependency "gRPC-Core/Tests", grpc_version
    ss.source_files = 'test/cpp/util/create_test_channel.cc',
                      'test/cpp/util/string_ref_helper.cc',
                      'test/cpp/util/subprocess.cc',
                      'test/cpp/util/test_credentials_provider.cc',
                      'test/cpp/util/create_test_channel.h',
                      'test/cpp/util/string_ref_helper.h',
                      'test/cpp/util/subprocess.h',
                      'test/cpp/util/test_credentials_provider.h',
                      'test/core/util/test_config.h',
                      'test/core/end2end/data/ssl_test_data.h',
                      'test/core/security/oauth2_utils.h',
                      'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h',
                      'test/core/end2end/cq_verifier.h',
                      'test/core/end2end/fixtures/http_proxy_fixture.h',
                      'test/core/end2end/fixtures/proxy.h',
                      'test/core/iomgr/endpoint_tests.h',
                      'test/core/util/debugger_macros.h',
                      'test/core/util/grpc_profiler.h',
                      'test/core/util/histogram.h',
                      'test/core/util/memory_counters.h',
                      'test/core/util/mock_endpoint.h',
                      'test/core/util/parse_hexstring.h',
                      'test/core/util/passthru_endpoint.h',
                      'test/core/util/port.h',
                      'test/core/util/port_server_client.h',
                      'test/core/util/slice_splitter.h',
                      'test/core/util/subprocess.h',
                      'test/core/util/tracer_util.h',
                      'test/core/util/trickle_endpoint.h',
                      'test/core/util/cmdline.h',
                      'src/core/lib/gpr/arena.h',
                      'src/core/lib/gpr/env.h',
                      'src/core/lib/gpr/fork.h',
                      'src/core/lib/gpr/host_port.h',
                      'src/core/lib/gpr/mpscq.h',
                      'src/core/lib/gpr/murmur_hash.h',
                      'src/core/lib/gpr/spinlock.h',
                      'src/core/lib/gpr/string.h',
                      'src/core/lib/gpr/string_windows.h',
                      'src/core/lib/gpr/thd.h',
                      'src/core/lib/gpr/time_precise.h',
                      'src/core/lib/gpr/tls.h',
                      'src/core/lib/gpr/tls_gcc.h',
                      'src/core/lib/gpr/tls_msvc.h',
                      'src/core/lib/gpr/tls_pthread.h',
                      'src/core/lib/gpr/tmpfile.h',
                      'src/core/lib/gpr/useful.h',
                      'src/core/lib/gprpp/abstract.h',
                      'src/core/lib/gprpp/atomic.h',
                      'src/core/lib/gprpp/atomic_with_atm.h',
                      'src/core/lib/gprpp/atomic_with_std.h',
                      'src/core/lib/gprpp/manual_constructor.h',
                      'src/core/lib/gprpp/memory.h',
                      'src/core/lib/profiling/timers.h',
                      'src/core/ext/filters/client_channel/backup_poller.h',
                      'src/core/ext/filters/client_channel/client_channel.h',
                      'src/core/ext/filters/client_channel/client_channel_factory.h',
                      'src/core/ext/filters/client_channel/connector.h',
                      'src/core/ext/filters/client_channel/http_connect_handshaker.h',
                      'src/core/ext/filters/client_channel/http_proxy.h',
                      'src/core/ext/filters/client_channel/lb_policy.h',
                      'src/core/ext/filters/client_channel/lb_policy_factory.h',
                      'src/core/ext/filters/client_channel/lb_policy_registry.h',
                      'src/core/ext/filters/client_channel/parse_address.h',
                      'src/core/ext/filters/client_channel/proxy_mapper.h',
                      'src/core/ext/filters/client_channel/proxy_mapper_registry.h',
                      'src/core/ext/filters/client_channel/resolver.h',
                      'src/core/ext/filters/client_channel/resolver_factory.h',
                      'src/core/ext/filters/client_channel/resolver_registry.h',
                      'src/core/ext/filters/client_channel/retry_throttle.h',
                      'src/core/ext/filters/client_channel/subchannel.h',
                      'src/core/ext/filters/client_channel/subchannel_index.h',
                      'src/core/ext/filters/client_channel/uri_parser.h',
                      'src/core/ext/filters/deadline/deadline_filter.h',
                      'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                      'src/core/ext/transport/chttp2/transport/bin_encoder.h',
                      'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
                      'src/core/ext/transport/chttp2/transport/flow_control.h',
                      'src/core/ext/transport/chttp2/transport/frame.h',
                      'src/core/ext/transport/chttp2/transport/frame_data.h',
                      'src/core/ext/transport/chttp2/transport/frame_goaway.h',
                      'src/core/ext/transport/chttp2/transport/frame_ping.h',
                      'src/core/ext/transport/chttp2/transport/frame_rst_stream.h',
                      'src/core/ext/transport/chttp2/transport/frame_settings.h',
                      'src/core/ext/transport/chttp2/transport/frame_window_update.h',
                      'src/core/ext/transport/chttp2/transport/hpack_encoder.h',
                      'src/core/ext/transport/chttp2/transport/hpack_parser.h',
                      'src/core/ext/transport/chttp2/transport/hpack_table.h',
                      'src/core/ext/transport/chttp2/transport/http2_settings.h',
                      'src/core/ext/transport/chttp2/transport/huffsyms.h',
                      'src/core/ext/transport/chttp2/transport/incoming_metadata.h',
                      'src/core/ext/transport/chttp2/transport/internal.h',
                      'src/core/ext/transport/chttp2/transport/stream_map.h',
                      'src/core/ext/transport/chttp2/transport/varint.h',
                      'src/core/ext/transport/chttp2/alpn/alpn.h',
                      'src/core/ext/filters/http/client/http_client_filter.h',
                      'src/core/ext/filters/http/message_compress/message_compress_filter.h',
                      'src/core/ext/filters/http/server/http_server_filter.h'
  end
  s.prepare_command = <<-END_OF_COMMAND
    find src/cpp/ -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
    find src/cpp/ -name "*.back" -type f -delete
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -22,7 +22,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-Core'
-  version = '1.10.0-dev'
+  version = '1.11.0-dev'
  s.version  = version
  s.summary  = 'Core cross-platform gRPC library, written in C'
  s.homepage = 'https://grpc.io'
@ -93,7 +93,7 @@ Pod::Spec.new do |s|
  }
  s.default_subspecs = 'Interface', 'Implementation'
-  s.compiler_flags = '-DGRPC_ARES=0'
+  s.compiler_flags = '-DGRPC_ARES=0', '-DPB_FIELD_16BIT'
  s.libraries = 'c++'
  # Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its
@ -192,7 +192,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/gpr/spinlock.h',
                      'src/core/lib/gpr/string.h',
                      'src/core/lib/gpr/string_windows.h',
                      'src/core/lib/gpr/thd.h',
                      'src/core/lib/gpr/time_precise.h',
                      'src/core/lib/gpr/tls.h',
                      'src/core/lib/gpr/tls_gcc.h',
@ -206,6 +205,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/gprpp/atomic_with_std.h',
                      'src/core/lib/gprpp/manual_constructor.h',
                      'src/core/lib/gprpp/memory.h',
                      'src/core/lib/gprpp/thd.h',
                      'src/core/lib/profiling/timers.h',
                      'src/core/lib/gpr/alloc.cc',
                      'src/core/lib/gpr/arena.cc',
@ -233,9 +233,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/gpr/sync.cc',
                      'src/core/lib/gpr/sync_posix.cc',
                      'src/core/lib/gpr/sync_windows.cc',
                      'src/core/lib/gpr/thd.cc',
                      'src/core/lib/gpr/thd_posix.cc',
                      'src/core/lib/gpr/thd_windows.cc',
                      'src/core/lib/gpr/time.cc',
                      'src/core/lib/gpr/time_posix.cc',
                      'src/core/lib/gpr/time_precise.cc',
@ -245,6 +242,8 @@ Pod::Spec.new do |s|
                      'src/core/lib/gpr/tmpfile_posix.cc',
                      'src/core/lib/gpr/tmpfile_windows.cc',
                      'src/core/lib/gpr/wrap_memcpy.cc',
                      'src/core/lib/gprpp/thd_posix.cc',
                      'src/core/lib/gprpp/thd_windows.cc',
                      'src/core/lib/profiling/basic_timers.cc',
                      'src/core/lib/profiling/stap_timers.cc',
                      'src/core/ext/transport/chttp2/transport/bin_decoder.h',
@ -272,6 +271,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/http/message_compress/message_compress_filter.h',
                      'src/core/ext/filters/http/server/http_server_filter.h',
                      'src/core/lib/security/context/security_context.h',
                      'src/core/lib/security/credentials/alts/alts_credentials.h',
                      'src/core/lib/security/credentials/composite/composite_credentials.h',
                      'src/core/lib/security/credentials/credentials.h',
                      'src/core/lib/security/credentials/fake/fake_credentials.h',
@ -283,22 +283,43 @@ Pod::Spec.new do |s|
                      'src/core/lib/security/credentials/oauth2/oauth2_credentials.h',
                      'src/core/lib/security/credentials/plugin/plugin_credentials.h',
                      'src/core/lib/security/credentials/ssl/ssl_credentials.h',
                      'src/core/lib/security/security_connector/alts_security_connector.h',
                      'src/core/lib/security/security_connector/security_connector.h',
                      'src/core/lib/security/transport/auth_filters.h',
                      'src/core/lib/security/transport/lb_targets_info.h',
                      'src/core/lib/security/transport/secure_endpoint.h',
                      'src/core/lib/security/transport/security_connector.h',
                      'src/core/lib/security/transport/security_handshaker.h',
                      'src/core/lib/security/transport/target_authority_table.h',
                      'src/core/lib/security/transport/tsi_error.h',
                      'src/core/lib/security/util/json_util.h',
-                      'src/core/tsi/alts_transport_security.h',
+                      'src/core/tsi/alts/crypt/gsec.h',
-                      'src/core/tsi/fake_transport_security.h',
+                      'src/core/tsi/alts/frame_protector/alts_counter.h',
-                      'src/core/tsi/ssl_transport_security.h',
+                      'src/core/tsi/alts/frame_protector/alts_crypter.h',
-                      'src/core/tsi/ssl_types.h',
+                      'src/core/tsi/alts/frame_protector/alts_frame_protector.h',
-                      'src/core/tsi/transport_security_grpc.h',
+                      'src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h',
                      'src/core/tsi/alts/frame_protector/frame_handler.h',
                      'src/core/tsi/alts/handshaker/alts_handshaker_client.h',
                      'src/core/tsi/alts/handshaker/alts_tsi_event.h',
                      'src/core/tsi/alts/handshaker/alts_tsi_handshaker.h',
                      'src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h',
                      'src/core/lib/security/credentials/alts/check_gcp_environment.h',
                      'src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h',
                      'src/core/tsi/alts/handshaker/alts_handshaker_service_api.h',
                      'src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h',
                      'src/core/tsi/alts/handshaker/alts_tsi_utils.h',
                      'src/core/tsi/alts/handshaker/transport_security_common_api.h',
                      'src/core/tsi/alts/handshaker/altscontext.pb.h',
                      'src/core/tsi/alts/handshaker/handshaker.pb.h',
                      'src/core/tsi/alts/handshaker/transport_security_common.pb.h',
                      'src/core/tsi/transport_security.h',
                      'src/core/tsi/transport_security_adapter.h',
                      'src/core/tsi/transport_security_interface.h',
-                      'src/core/ext/transport/chttp2/server/chttp2_server.h',
+                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                      'src/core/ext/filters/client_channel/backup_poller.h',
                      'src/core/ext/filters/client_channel/client_channel.h',
                      'src/core/ext/filters/client_channel/client_channel_factory.h',
@ -308,6 +329,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/lb_policy.h',
                      'src/core/ext/filters/client_channel/lb_policy_factory.h',
                      'src/core/ext/filters/client_channel/lb_policy_registry.h',
                      'src/core/ext/filters/client_channel/method_params.h',
                      'src/core/ext/filters/client_channel/parse_address.h',
                      'src/core/ext/filters/client_channel/proxy_mapper.h',
                      'src/core/ext/filters/client_channel/proxy_mapper_registry.h',
@ -315,11 +337,17 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/resolver_factory.h',
                      'src/core/ext/filters/client_channel/resolver_registry.h',
                      'src/core/ext/filters/client_channel/retry_throttle.h',
                      'src/core/ext/filters/client_channel/status_util.h',
                      'src/core/ext/filters/client_channel/subchannel.h',
                      'src/core/ext/filters/client_channel/subchannel_index.h',
                      'src/core/ext/filters/client_channel/uri_parser.h',
                      'src/core/ext/filters/deadline/deadline_filter.h',
-                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
+                      'src/core/tsi/alts_transport_security.h',
                      'src/core/tsi/fake_transport_security.h',
                      'src/core/tsi/ssl_transport_security.h',
                      'src/core/tsi/ssl_types.h',
                      'src/core/tsi/transport_security_grpc.h',
                      'src/core/ext/transport/chttp2/server/chttp2_server.h',
                      'src/core/ext/transport/inproc/inproc_transport.h',
                      'src/core/lib/avl/avl.h',
                      'src/core/lib/backoff/backoff.h',
@ -419,6 +447,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/slice/slice_hash_table.h',
                      'src/core/lib/slice/slice_internal.h',
                      'src/core/lib/slice/slice_string_helpers.h',
                      'src/core/lib/slice/slice_weak_hash_table.h',
                      'src/core/lib/surface/api_trace.h',
                      'src/core/lib/surface/call.h',
                      'src/core/lib/surface/call_test_only.h',
@ -443,12 +472,12 @@ Pod::Spec.new do |s|
                      'src/core/lib/transport/service_config.h',
                      'src/core/lib/transport/static_metadata.h',
                      'src/core/lib/transport/status_conversion.h',
                      'src/core/lib/transport/status_metadata.h',
                      'src/core/lib/transport/timeout_encoding.h',
                      'src/core/lib/transport/transport.h',
                      'src/core/lib/transport/transport_impl.h',
                      'src/core/lib/debug/trace.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h',
@ -564,7 +593,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/slice/percent_encoding.cc',
                      'src/core/lib/slice/slice.cc',
                      'src/core/lib/slice/slice_buffer.cc',
                      'src/core/lib/slice/slice_hash_table.cc',
                      'src/core/lib/slice/slice_intern.cc',
                      'src/core/lib/slice/slice_string_helpers.cc',
                      'src/core/lib/surface/api_trace.cc',
@ -595,6 +623,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/transport/service_config.cc',
                      'src/core/lib/transport/static_metadata.cc',
                      'src/core/lib/transport/status_conversion.cc',
                      'src/core/lib/transport/status_metadata.cc',
                      'src/core/lib/transport/timeout_encoding.cc',
                      'src/core/lib/transport/transport.cc',
                      'src/core/lib/transport/transport_op_string.cc',
@ -629,6 +658,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/http/server/http_server_filter.cc',
                      'src/core/lib/http/httpcli_security_connector.cc',
                      'src/core/lib/security/context/security_context.cc',
                      'src/core/lib/security/credentials/alts/alts_credentials.cc',
                      'src/core/lib/security/credentials/composite/composite_credentials.cc',
                      'src/core/lib/security/credentials/credentials.cc',
                      'src/core/lib/security/credentials/credentials_metadata.cc',
@ -642,23 +672,52 @@ Pod::Spec.new do |s|
                      'src/core/lib/security/credentials/oauth2/oauth2_credentials.cc',
                      'src/core/lib/security/credentials/plugin/plugin_credentials.cc',
                      'src/core/lib/security/credentials/ssl/ssl_credentials.cc',
                      'src/core/lib/security/security_connector/alts_security_connector.cc',
                      'src/core/lib/security/security_connector/security_connector.cc',
                      'src/core/lib/security/transport/client_auth_filter.cc',
                      'src/core/lib/security/transport/lb_targets_info.cc',
                      'src/core/lib/security/transport/secure_endpoint.cc',
                      'src/core/lib/security/transport/security_connector.cc',
                      'src/core/lib/security/transport/security_handshaker.cc',
                      'src/core/lib/security/transport/server_auth_filter.cc',
                      'src/core/lib/security/transport/target_authority_table.cc',
                      'src/core/lib/security/transport/tsi_error.cc',
                      'src/core/lib/security/util/json_util.cc',
                      'src/core/lib/surface/init_secure.cc',
-                      'src/core/tsi/alts_transport_security.cc',
+                      'src/core/tsi/alts/crypt/aes_gcm.cc',
-                      'src/core/tsi/fake_transport_security.cc',
+                      'src/core/tsi/alts/crypt/gsec.cc',
-                      'src/core/tsi/ssl_transport_security.cc',
+                      'src/core/tsi/alts/frame_protector/alts_counter.cc',
-                      'src/core/tsi/transport_security_grpc.cc',
+                      'src/core/tsi/alts/frame_protector/alts_crypter.cc',
                      'src/core/tsi/alts/frame_protector/alts_frame_protector.cc',
                      'src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc',
                      'src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc',
                      'src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc',
                      'src/core/tsi/alts/frame_protector/frame_handler.cc',
                      'src/core/tsi/alts/handshaker/alts_handshaker_client.cc',
                      'src/core/tsi/alts/handshaker/alts_tsi_event.cc',
                      'src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc',
                      'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc',
                      'src/core/lib/security/credentials/alts/check_gcp_environment.cc',
                      'src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc',
                      'src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc',
                      'src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc',
                      'src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc',
                      'src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc',
                      'src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc',
                      'src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc',
                      'src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc',
                      'src/core/tsi/alts/handshaker/alts_tsi_utils.cc',
                      'src/core/tsi/alts/handshaker/transport_security_common_api.cc',
                      'src/core/tsi/alts/handshaker/altscontext.pb.c',
                      'src/core/tsi/alts/handshaker/handshaker.pb.c',
                      'src/core/tsi/alts/handshaker/transport_security_common.pb.c',
                      'src/core/tsi/transport_security.cc',
                      'src/core/tsi/transport_security_adapter.cc',
-                      'src/core/ext/transport/chttp2/server/chttp2_server.cc',
+                      'src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
-                      'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
+                      'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
                      'src/core/ext/filters/client_channel/backup_poller.cc',
                      'src/core/ext/filters/client_channel/channel_connectivity.cc',
                      'src/core/ext/filters/client_channel/client_channel.cc',
@ -670,21 +729,26 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/lb_policy.cc',
                      'src/core/ext/filters/client_channel/lb_policy_factory.cc',
                      'src/core/ext/filters/client_channel/lb_policy_registry.cc',
                      'src/core/ext/filters/client_channel/method_params.cc',
                      'src/core/ext/filters/client_channel/parse_address.cc',
                      'src/core/ext/filters/client_channel/proxy_mapper.cc',
                      'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
                      'src/core/ext/filters/client_channel/resolver.cc',
                      'src/core/ext/filters/client_channel/resolver_registry.cc',
                      'src/core/ext/filters/client_channel/retry_throttle.cc',
                      'src/core/ext/filters/client_channel/status_util.cc',
                      'src/core/ext/filters/client_channel/subchannel.cc',
                      'src/core/ext/filters/client_channel/subchannel_index.cc',
                      'src/core/ext/filters/client_channel/uri_parser.cc',
                      'src/core/ext/filters/deadline/deadline_filter.cc',
-                      'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
+                      'src/core/tsi/alts_transport_security.cc',
                      'src/core/tsi/fake_transport_security.cc',
                      'src/core/tsi/ssl_transport_security.cc',
                      'src/core/tsi/transport_security_grpc.cc',
                      'src/core/ext/transport/chttp2/server/chttp2_server.cc',
                      'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
                      'src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc',
                      'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc',
                      'src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
                      'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc',
                      'src/core/ext/transport/inproc/inproc_plugin.cc',
                      'src/core/ext/transport/inproc/inproc_transport.cc',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc',
@ -721,7 +785,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/gpr/spinlock.h',
                              'src/core/lib/gpr/string.h',
                              'src/core/lib/gpr/string_windows.h',
                              'src/core/lib/gpr/thd.h',
                              'src/core/lib/gpr/time_precise.h',
                              'src/core/lib/gpr/tls.h',
                              'src/core/lib/gpr/tls_gcc.h',
@ -735,6 +798,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/gprpp/atomic_with_std.h',
                              'src/core/lib/gprpp/manual_constructor.h',
                              'src/core/lib/gprpp/memory.h',
                              'src/core/lib/gprpp/thd.h',
                              'src/core/lib/profiling/timers.h',
                              'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                              'src/core/ext/transport/chttp2/transport/bin_encoder.h',
@ -761,6 +825,7 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/http/message_compress/message_compress_filter.h',
                              'src/core/ext/filters/http/server/http_server_filter.h',
                              'src/core/lib/security/context/security_context.h',
                              'src/core/lib/security/credentials/alts/alts_credentials.h',
                              'src/core/lib/security/credentials/composite/composite_credentials.h',
                              'src/core/lib/security/credentials/credentials.h',
                              'src/core/lib/security/credentials/fake/fake_credentials.h',
@ -772,22 +837,43 @@ Pod::Spec.new do |s|
                              'src/core/lib/security/credentials/oauth2/oauth2_credentials.h',
                              'src/core/lib/security/credentials/plugin/plugin_credentials.h',
                              'src/core/lib/security/credentials/ssl/ssl_credentials.h',
                              'src/core/lib/security/security_connector/alts_security_connector.h',
                              'src/core/lib/security/security_connector/security_connector.h',
                              'src/core/lib/security/transport/auth_filters.h',
                              'src/core/lib/security/transport/lb_targets_info.h',
                              'src/core/lib/security/transport/secure_endpoint.h',
                              'src/core/lib/security/transport/security_connector.h',
                              'src/core/lib/security/transport/security_handshaker.h',
                              'src/core/lib/security/transport/target_authority_table.h',
                              'src/core/lib/security/transport/tsi_error.h',
                              'src/core/lib/security/util/json_util.h',
-                              'src/core/tsi/alts_transport_security.h',
+                              'src/core/tsi/alts/crypt/gsec.h',
-                              'src/core/tsi/fake_transport_security.h',
+                              'src/core/tsi/alts/frame_protector/alts_counter.h',
-                              'src/core/tsi/ssl_transport_security.h',
+                              'src/core/tsi/alts/frame_protector/alts_crypter.h',
-                              'src/core/tsi/ssl_types.h',
+                              'src/core/tsi/alts/frame_protector/alts_frame_protector.h',
-                              'src/core/tsi/transport_security_grpc.h',
+                              'src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h',
                              'src/core/tsi/alts/frame_protector/frame_handler.h',
                              'src/core/tsi/alts/handshaker/alts_handshaker_client.h',
                              'src/core/tsi/alts/handshaker/alts_tsi_event.h',
                              'src/core/tsi/alts/handshaker/alts_tsi_handshaker.h',
                              'src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h',
                              'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h',
                              'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h',
                              'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h',
                              'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h',
                              'src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h',
                              'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h',
                              'src/core/lib/security/credentials/alts/check_gcp_environment.h',
                              'src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h',
                              'src/core/tsi/alts/handshaker/alts_handshaker_service_api.h',
                              'src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h',
                              'src/core/tsi/alts/handshaker/alts_tsi_utils.h',
                              'src/core/tsi/alts/handshaker/transport_security_common_api.h',
                              'src/core/tsi/alts/handshaker/altscontext.pb.h',
                              'src/core/tsi/alts/handshaker/handshaker.pb.h',
                              'src/core/tsi/alts/handshaker/transport_security_common.pb.h',
                              'src/core/tsi/transport_security.h',
                              'src/core/tsi/transport_security_adapter.h',
                              'src/core/tsi/transport_security_interface.h',
-                              'src/core/ext/transport/chttp2/server/chttp2_server.h',
+                              'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                              'src/core/ext/filters/client_channel/backup_poller.h',
                              'src/core/ext/filters/client_channel/client_channel.h',
                              'src/core/ext/filters/client_channel/client_channel_factory.h',
@ -797,6 +883,7 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/client_channel/lb_policy.h',
                              'src/core/ext/filters/client_channel/lb_policy_factory.h',
                              'src/core/ext/filters/client_channel/lb_policy_registry.h',
                              'src/core/ext/filters/client_channel/method_params.h',
                              'src/core/ext/filters/client_channel/parse_address.h',
                              'src/core/ext/filters/client_channel/proxy_mapper.h',
                              'src/core/ext/filters/client_channel/proxy_mapper_registry.h',
@ -804,11 +891,17 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/client_channel/resolver_factory.h',
                              'src/core/ext/filters/client_channel/resolver_registry.h',
                              'src/core/ext/filters/client_channel/retry_throttle.h',
                              'src/core/ext/filters/client_channel/status_util.h',
                              'src/core/ext/filters/client_channel/subchannel.h',
                              'src/core/ext/filters/client_channel/subchannel_index.h',
                              'src/core/ext/filters/client_channel/uri_parser.h',
                              'src/core/ext/filters/deadline/deadline_filter.h',
-                              'src/core/ext/transport/chttp2/client/chttp2_connector.h',
+                              'src/core/tsi/alts_transport_security.h',
                              'src/core/tsi/fake_transport_security.h',
                              'src/core/tsi/ssl_transport_security.h',
                              'src/core/tsi/ssl_types.h',
                              'src/core/tsi/transport_security_grpc.h',
                              'src/core/ext/transport/chttp2/server/chttp2_server.h',
                              'src/core/ext/transport/inproc/inproc_transport.h',
                              'src/core/lib/avl/avl.h',
                              'src/core/lib/backoff/backoff.h',
@ -908,6 +1001,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/slice/slice_hash_table.h',
                              'src/core/lib/slice/slice_internal.h',
                              'src/core/lib/slice/slice_string_helpers.h',
                              'src/core/lib/slice/slice_weak_hash_table.h',
                              'src/core/lib/surface/api_trace.h',
                              'src/core/lib/surface/call.h',
                              'src/core/lib/surface/call_test_only.h',
@ -932,12 +1026,12 @@ Pod::Spec.new do |s|
                              'src/core/lib/transport/service_config.h',
                              'src/core/lib/transport/static_metadata.h',
                              'src/core/lib/transport/status_conversion.h',
                              'src/core/lib/transport/status_metadata.h',
                              'src/core/lib/transport/timeout_encoding.h',
                              'src/core/lib/transport/transport.h',
                              'src/core/lib/transport/transport_impl.h',
                              'src/core/lib/debug/trace.h',
                              'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h',
                              'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h',
                              'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h',
                              'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h',
                              'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h',
@ -968,8 +1062,15 @@ Pod::Spec.new do |s|
    ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc',
                      'src/core/ext/transport/cronet/transport/cronet_transport.cc',
                      'third_party/nanopb/pb_common.c',
                      'third_party/nanopb/pb_decode.c',
                      'third_party/nanopb/pb_encode.c',
                      'src/core/ext/transport/cronet/transport/cronet_transport.h',
-                      'third_party/objective_c/Cronet/bidirectional_stream_c.h'
+                      'third_party/objective_c/Cronet/bidirectional_stream_c.h',
                      'third_party/nanopb/pb.h',
                      'third_party/nanopb/pb_common.h',
                      'third_party/nanopb/pb_decode.h',
                      'third_party/nanopb/pb_encode.h'
  end
  s.subspec 'Tests' do |ss|
@ -1072,6 +1173,21 @@ Pod::Spec.new do |s|
                      'test/core/end2end/tests/request_with_flags.cc',
                      'test/core/end2end/tests/request_with_payload.cc',
                      'test/core/end2end/tests/resource_quota_server.cc',
                      'test/core/end2end/tests/retry.cc',
                      'test/core/end2end/tests/retry_cancellation.cc',
                      'test/core/end2end/tests/retry_disabled.cc',
                      'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',
                      'test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc',
                      'test/core/end2end/tests/retry_non_retriable_status.cc',
                      'test/core/end2end/tests/retry_recv_initial_metadata.cc',
                      'test/core/end2end/tests/retry_recv_message.cc',
                      'test/core/end2end/tests/retry_server_pushback_delay.cc',
                      'test/core/end2end/tests/retry_server_pushback_disabled.cc',
                      'test/core/end2end/tests/retry_streaming.cc',
                      'test/core/end2end/tests/retry_streaming_after_commit.cc',
                      'test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc',
                      'test/core/end2end/tests/retry_throttled.cc',
                      'test/core/end2end/tests/retry_too_many_attempts.cc',
                      'test/core/end2end/tests/server_finishes_request.cc',
                      'test/core/end2end/tests/shutdown_finishes_calls.cc',
                      'test/core/end2end/tests/shutdown_finishes_tags.cc',
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@ -21,7 +21,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-ProtoRPC'
-  version = '1.10.0-dev'
+  version = '1.11.0-dev'
  s.version  = version
  s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
  s.homepage = 'https://grpc.io'
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@ -21,7 +21,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-RxLibrary'
-  version = '1.10.0-dev'
+  version = '1.11.0-dev'
  s.version  = version
  s.summary  = 'Reactive Extensions library for iOS/OSX.'
  s.homepage = 'https://grpc.io'
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -20,7 +20,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC'
-  version = '1.10.0-dev'
+  version = '1.11.0-dev'
  s.version  = version
  s.summary  = 'gRPC client library for iOS/OSX'
  s.homepage = 'https://grpc.io'
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -83,7 +83,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gpr/spinlock.h )
  s.files += %w( src/core/lib/gpr/string.h )
  s.files += %w( src/core/lib/gpr/string_windows.h )
  s.files += %w( src/core/lib/gpr/thd.h )
  s.files += %w( src/core/lib/gpr/time_precise.h )
  s.files += %w( src/core/lib/gpr/tls.h )
  s.files += %w( src/core/lib/gpr/tls_gcc.h )
@ -97,6 +96,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gprpp/atomic_with_std.h )
  s.files += %w( src/core/lib/gprpp/manual_constructor.h )
  s.files += %w( src/core/lib/gprpp/memory.h )
  s.files += %w( src/core/lib/gprpp/thd.h )
  s.files += %w( src/core/lib/profiling/timers.h )
  s.files += %w( src/core/lib/gpr/alloc.cc )
  s.files += %w( src/core/lib/gpr/arena.cc )
@ -124,9 +124,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gpr/sync.cc )
  s.files += %w( src/core/lib/gpr/sync_posix.cc )
  s.files += %w( src/core/lib/gpr/sync_windows.cc )
  s.files += %w( src/core/lib/gpr/thd.cc )
  s.files += %w( src/core/lib/gpr/thd_posix.cc )
  s.files += %w( src/core/lib/gpr/thd_windows.cc )
  s.files += %w( src/core/lib/gpr/time.cc )
  s.files += %w( src/core/lib/gpr/time_posix.cc )
  s.files += %w( src/core/lib/gpr/time_precise.cc )
@ -136,6 +133,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/gpr/tmpfile_posix.cc )
  s.files += %w( src/core/lib/gpr/tmpfile_windows.cc )
  s.files += %w( src/core/lib/gpr/wrap_memcpy.cc )
  s.files += %w( src/core/lib/gprpp/thd_posix.cc )
  s.files += %w( src/core/lib/gprpp/thd_windows.cc )
  s.files += %w( src/core/lib/profiling/basic_timers.cc )
  s.files += %w( src/core/lib/profiling/stap_timers.cc )
  s.files += %w( include/grpc/impl/codegen/byte_buffer.h )
@ -198,6 +197,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/http/message_compress/message_compress_filter.h )
  s.files += %w( src/core/ext/filters/http/server/http_server_filter.h )
  s.files += %w( src/core/lib/security/context/security_context.h )
  s.files += %w( src/core/lib/security/credentials/alts/alts_credentials.h )
  s.files += %w( src/core/lib/security/credentials/composite/composite_credentials.h )
  s.files += %w( src/core/lib/security/credentials/credentials.h )
  s.files += %w( src/core/lib/security/credentials/fake/fake_credentials.h )
@ -209,22 +209,47 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/security/credentials/oauth2/oauth2_credentials.h )
  s.files += %w( src/core/lib/security/credentials/plugin/plugin_credentials.h )
  s.files += %w( src/core/lib/security/credentials/ssl/ssl_credentials.h )
  s.files += %w( src/core/lib/security/security_connector/alts_security_connector.h )
  s.files += %w( src/core/lib/security/security_connector/security_connector.h )
  s.files += %w( src/core/lib/security/transport/auth_filters.h )
  s.files += %w( src/core/lib/security/transport/lb_targets_info.h )
  s.files += %w( src/core/lib/security/transport/secure_endpoint.h )
  s.files += %w( src/core/lib/security/transport/security_connector.h )
  s.files += %w( src/core/lib/security/transport/security_handshaker.h )
  s.files += %w( src/core/lib/security/transport/target_authority_table.h )
  s.files += %w( src/core/lib/security/transport/tsi_error.h )
  s.files += %w( src/core/lib/security/util/json_util.h )
-  s.files += %w( src/core/tsi/alts_transport_security.h )
+  s.files += %w( src/core/tsi/alts/crypt/gsec.h )
-  s.files += %w( src/core/tsi/fake_transport_security.h )
+  s.files += %w( src/core/tsi/alts/frame_protector/alts_counter.h )
-  s.files += %w( src/core/tsi/ssl_transport_security.h )
+  s.files += %w( src/core/tsi/alts/frame_protector/alts_crypter.h )
-  s.files += %w( src/core/tsi/ssl_types.h )
+  s.files += %w( src/core/tsi/alts/frame_protector/alts_frame_protector.h )
-  s.files += %w( src/core/tsi/transport_security_grpc.h )
+  s.files += %w( src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h )
  s.files += %w( src/core/tsi/alts/frame_protector/frame_handler.h )
  s.files += %w( src/core/tsi/alts/handshaker/alts_handshaker_client.h )
  s.files += %w( src/core/tsi/alts/handshaker/alts_tsi_event.h )
  s.files += %w( src/core/tsi/alts/handshaker/alts_tsi_handshaker.h )
  s.files += %w( src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h )
  s.files += %w( src/core/lib/security/credentials/alts/check_gcp_environment.h )
  s.files += %w( src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h )
  s.files += %w( src/core/tsi/alts/handshaker/alts_handshaker_service_api.h )
  s.files += %w( src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h )
  s.files += %w( src/core/tsi/alts/handshaker/alts_tsi_utils.h )
  s.files += %w( src/core/tsi/alts/handshaker/transport_security_common_api.h )
  s.files += %w( src/core/tsi/alts/handshaker/altscontext.pb.h )
  s.files += %w( src/core/tsi/alts/handshaker/handshaker.pb.h )
  s.files += %w( src/core/tsi/alts/handshaker/transport_security_common.pb.h )
  s.files += %w( third_party/nanopb/pb.h )
  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/tsi/transport_security.h )
  s.files += %w( src/core/tsi/transport_security_adapter.h )
  s.files += %w( src/core/tsi/transport_security_interface.h )
-  s.files += %w( src/core/ext/transport/chttp2/server/chttp2_server.h )
+  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.h )
  s.files += %w( src/core/ext/filters/client_channel/backup_poller.h )
  s.files += %w( src/core/ext/filters/client_channel/client_channel.h )
  s.files += %w( src/core/ext/filters/client_channel/client_channel_factory.h )
@ -234,6 +259,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/lb_policy.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy_factory.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy_registry.h )
  s.files += %w( src/core/ext/filters/client_channel/method_params.h )
  s.files += %w( src/core/ext/filters/client_channel/parse_address.h )
  s.files += %w( src/core/ext/filters/client_channel/proxy_mapper.h )
  s.files += %w( src/core/ext/filters/client_channel/proxy_mapper_registry.h )
@ -241,11 +267,17 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/resolver_factory.h )
  s.files += %w( src/core/ext/filters/client_channel/resolver_registry.h )
  s.files += %w( src/core/ext/filters/client_channel/retry_throttle.h )
  s.files += %w( src/core/ext/filters/client_channel/status_util.h )
  s.files += %w( src/core/ext/filters/client_channel/subchannel.h )
  s.files += %w( src/core/ext/filters/client_channel/subchannel_index.h )
  s.files += %w( src/core/ext/filters/client_channel/uri_parser.h )
  s.files += %w( src/core/ext/filters/deadline/deadline_filter.h )
-  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.h )
+  s.files += %w( src/core/tsi/alts_transport_security.h )
  s.files += %w( src/core/tsi/fake_transport_security.h )
  s.files += %w( src/core/tsi/ssl_transport_security.h )
  s.files += %w( src/core/tsi/ssl_types.h )
  s.files += %w( src/core/tsi/transport_security_grpc.h )
  s.files += %w( src/core/ext/transport/chttp2/server/chttp2_server.h )
  s.files += %w( src/core/ext/transport/inproc/inproc_transport.h )
  s.files += %w( src/core/lib/avl/avl.h )
  s.files += %w( src/core/lib/backoff/backoff.h )
@ -345,6 +377,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/slice/slice_hash_table.h )
  s.files += %w( src/core/lib/slice/slice_internal.h )
  s.files += %w( src/core/lib/slice/slice_string_helpers.h )
  s.files += %w( src/core/lib/slice/slice_weak_hash_table.h )
  s.files += %w( src/core/lib/surface/api_trace.h )
  s.files += %w( src/core/lib/surface/call.h )
  s.files += %w( src/core/lib/surface/call_test_only.h )
@ -369,20 +402,16 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/transport/service_config.h )
  s.files += %w( src/core/lib/transport/static_metadata.h )
  s.files += %w( src/core/lib/transport/status_conversion.h )
  s.files += %w( src/core/lib/transport/status_metadata.h )
  s.files += %w( src/core/lib/transport/timeout_encoding.h )
  s.files += %w( src/core/lib/transport/transport.h )
  s.files += %w( src/core/lib/transport/transport_impl.h )
  s.files += %w( src/core/lib/debug/trace.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h )
  s.files += %w( third_party/nanopb/pb.h )
  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/filters/client_channel/resolver/fake/fake_resolver.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/subchannel_list.h )
  s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h )
@ -494,7 +523,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/slice/percent_encoding.cc )
  s.files += %w( src/core/lib/slice/slice.cc )
  s.files += %w( src/core/lib/slice/slice_buffer.cc )
  s.files += %w( src/core/lib/slice/slice_hash_table.cc )
  s.files += %w( src/core/lib/slice/slice_intern.cc )
  s.files += %w( src/core/lib/slice/slice_string_helpers.cc )
  s.files += %w( src/core/lib/surface/api_trace.cc )
@ -525,6 +553,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/transport/service_config.cc )
  s.files += %w( src/core/lib/transport/static_metadata.cc )
  s.files += %w( src/core/lib/transport/status_conversion.cc )
  s.files += %w( src/core/lib/transport/status_metadata.cc )
  s.files += %w( src/core/lib/transport/timeout_encoding.cc )
  s.files += %w( src/core/lib/transport/transport.cc )
  s.files += %w( src/core/lib/transport/transport_op_string.cc )
@ -559,6 +588,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/http/server/http_server_filter.cc )
  s.files += %w( src/core/lib/http/httpcli_security_connector.cc )
  s.files += %w( src/core/lib/security/context/security_context.cc )
  s.files += %w( src/core/lib/security/credentials/alts/alts_credentials.cc )
  s.files += %w( src/core/lib/security/credentials/composite/composite_credentials.cc )
  s.files += %w( src/core/lib/security/credentials/credentials.cc )
  s.files += %w( src/core/lib/security/credentials/credentials_metadata.cc )
@ -572,23 +602,55 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/security/credentials/oauth2/oauth2_credentials.cc )
  s.files += %w( src/core/lib/security/credentials/plugin/plugin_credentials.cc )
  s.files += %w( src/core/lib/security/credentials/ssl/ssl_credentials.cc )
  s.files += %w( src/core/lib/security/security_connector/alts_security_connector.cc )
  s.files += %w( src/core/lib/security/security_connector/security_connector.cc )
  s.files += %w( src/core/lib/security/transport/client_auth_filter.cc )
  s.files += %w( src/core/lib/security/transport/lb_targets_info.cc )
  s.files += %w( src/core/lib/security/transport/secure_endpoint.cc )
  s.files += %w( src/core/lib/security/transport/security_connector.cc )
  s.files += %w( src/core/lib/security/transport/security_handshaker.cc )
  s.files += %w( src/core/lib/security/transport/server_auth_filter.cc )
  s.files += %w( src/core/lib/security/transport/target_authority_table.cc )
  s.files += %w( src/core/lib/security/transport/tsi_error.cc )
  s.files += %w( src/core/lib/security/util/json_util.cc )
  s.files += %w( src/core/lib/surface/init_secure.cc )
-  s.files += %w( src/core/tsi/alts_transport_security.cc )
+  s.files += %w( src/core/tsi/alts/crypt/aes_gcm.cc )
-  s.files += %w( src/core/tsi/fake_transport_security.cc )
+  s.files += %w( src/core/tsi/alts/crypt/gsec.cc )
-  s.files += %w( src/core/tsi/ssl_transport_security.cc )
+  s.files += %w( src/core/tsi/alts/frame_protector/alts_counter.cc )
-  s.files += %w( src/core/tsi/transport_security_grpc.cc )
+  s.files += %w( src/core/tsi/alts/frame_protector/alts_crypter.cc )
  s.files += %w( src/core/tsi/alts/frame_protector/alts_frame_protector.cc )
  s.files += %w( src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc )
  s.files += %w( src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc )
  s.files += %w( src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc )
  s.files += %w( src/core/tsi/alts/frame_protector/frame_handler.cc )
  s.files += %w( src/core/tsi/alts/handshaker/alts_handshaker_client.cc )
  s.files += %w( src/core/tsi/alts/handshaker/alts_tsi_event.cc )
  s.files += %w( src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc )
  s.files += %w( src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc )
  s.files += %w( src/core/lib/security/credentials/alts/check_gcp_environment.cc )
  s.files += %w( src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc )
  s.files += %w( src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc )
  s.files += %w( src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc )
  s.files += %w( src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc )
  s.files += %w( src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc )
  s.files += %w( src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc )
  s.files += %w( src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc )
  s.files += %w( src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc )
  s.files += %w( src/core/tsi/alts/handshaker/alts_tsi_utils.cc )
  s.files += %w( src/core/tsi/alts/handshaker/transport_security_common_api.cc )
  s.files += %w( src/core/tsi/alts/handshaker/altscontext.pb.c )
  s.files += %w( src/core/tsi/alts/handshaker/handshaker.pb.c )
  s.files += %w( src/core/tsi/alts/handshaker/transport_security_common.pb.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 )
  s.files += %w( src/core/tsi/transport_security.cc )
  s.files += %w( src/core/tsi/transport_security_adapter.cc )
-  s.files += %w( src/core/ext/transport/chttp2/server/chttp2_server.cc )
+  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.cc )
-  s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc )
+  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc )
  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.cc )
  s.files += %w( src/core/ext/filters/client_channel/backup_poller.cc )
  s.files += %w( src/core/ext/filters/client_channel/channel_connectivity.cc )
  s.files += %w( src/core/ext/filters/client_channel/client_channel.cc )
@ -600,21 +662,26 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/lb_policy.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy_factory.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy_registry.cc )
  s.files += %w( src/core/ext/filters/client_channel/method_params.cc )
  s.files += %w( src/core/ext/filters/client_channel/parse_address.cc )
  s.files += %w( src/core/ext/filters/client_channel/proxy_mapper.cc )
  s.files += %w( src/core/ext/filters/client_channel/proxy_mapper_registry.cc )
  s.files += %w( src/core/ext/filters/client_channel/resolver.cc )
  s.files += %w( src/core/ext/filters/client_channel/resolver_registry.cc )
  s.files += %w( src/core/ext/filters/client_channel/retry_throttle.cc )
  s.files += %w( src/core/ext/filters/client_channel/status_util.cc )
  s.files += %w( src/core/ext/filters/client_channel/subchannel.cc )
  s.files += %w( src/core/ext/filters/client_channel/subchannel_index.cc )
  s.files += %w( src/core/ext/filters/client_channel/uri_parser.cc )
  s.files += %w( src/core/ext/filters/deadline/deadline_filter.cc )
-  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.cc )
+  s.files += %w( src/core/tsi/alts_transport_security.cc )
  s.files += %w( src/core/tsi/fake_transport_security.cc )
  s.files += %w( src/core/tsi/ssl_transport_security.cc )
  s.files += %w( src/core/tsi/transport_security_grpc.cc )
  s.files += %w( src/core/ext/transport/chttp2/server/chttp2_server.cc )
  s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc )
  s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc )
  s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc )
  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.cc )
  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc )
  s.files += %w( src/core/ext/transport/inproc/inproc_plugin.cc )
  s.files += %w( src/core/ext/transport/inproc/inproc_transport.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc )
@ -623,9 +690,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.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 )
  s.files += %w( src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc )
@ -650,23 +714,82 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/cipher_extra/internal.h )
  s.files += %w( third_party/boringssl/crypto/conf/conf_def.h )
  s.files += %w( third_party/boringssl/crypto/conf/internal.h )
  s.files += %w( third_party/boringssl/crypto/curve25519/internal.h )
  s.files += %w( third_party/boringssl/crypto/err/internal.h )
  s.files += %w( third_party/boringssl/crypto/evp/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/aes.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/key_wrap.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/mode_wrappers.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/add.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/asm/x86_64-gcc.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/bn.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/bytes.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/cmp.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/ctx.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/div.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/gcd.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/generic.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/jacobi.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/montgomery.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/montgomery_inv.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/mul.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/prime.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/random.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/shift.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/sqrt.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/aead.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/cipher.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/e_aes.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/e_des.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/delocate.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/des/des.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/des/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/digest.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/digests.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/md32_common.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec_key.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/oct.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p224-64.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-64.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/simple.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/util-64.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/wnaf.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/hmac/hmac.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/md4/md4.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/md5/md5.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/cbc.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/cfb.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/ctr.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/gcm.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/ofb.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/polyval.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/rand.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/urandom.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/blinding.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/internal.h )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/padding.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/rsa.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha1-altivec.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha1.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha256.c )
  s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha512.c )
  s.files += %w( third_party/boringssl/crypto/internal.h )
  s.files += %w( third_party/boringssl/crypto/obj/obj_dat.h )
  s.files += %w( third_party/boringssl/crypto/pkcs7/internal.h )
@ -752,6 +875,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/include/openssl/x509_vfy.h )
  s.files += %w( third_party/boringssl/include/openssl/x509v3.h )
  s.files += %w( third_party/boringssl/ssl/internal.h )
  s.files += %w( third_party/boringssl/third_party/fiat/internal.h )
  s.files += %w( src/boringssl/err_data.c )
  s.files += %w( third_party/boringssl/crypto/asn1/a_bitstr.c )
  s.files += %w( third_party/boringssl/crypto/asn1/a_bool.c )
@ -821,7 +945,6 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/crypto/cpu-intel.c )
  s.files += %w( third_party/boringssl/crypto/cpu-ppc64le.c )
  s.files += %w( third_party/boringssl/crypto/crypto.c )
  s.files += %w( third_party/boringssl/crypto/curve25519/curve25519.c )
  s.files += %w( third_party/boringssl/crypto/curve25519/spake25519.c )
  s.files += %w( third_party/boringssl/crypto/curve25519/x25519-x86_64.c )
  s.files += %w( third_party/boringssl/crypto/dh/check.c )
@ -1007,6 +1130,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/boringssl/ssl/tls13_server.cc )
  s.files += %w( third_party/boringssl/ssl/tls_method.cc )
  s.files += %w( third_party/boringssl/ssl/tls_record.cc )
  s.files += %w( third_party/boringssl/third_party/fiat/curve25519.c )
  s.files += %w( third_party/zlib/crc32.h )
  s.files += %w( third_party/zlib/deflate.h )
  s.files += %w( third_party/zlib/gzguts.h )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -64,11 +64,11 @@
    ],
    'cflags_c': [
      '-Werror',
-      '-std=c99'
+      '-std=c99',
    ],
    'cflags_cc': [
      '-Werror',
-      '-std=c++11'
+      '-std=c++11',
    ],
    'include_dirs': [
      '.',
@ -148,13 +148,24 @@
            '-Wno-deprecated-declarations',
            '-stdlib=libc++',
            '-std=c++11',
-            '-Wno-error=deprecated-declarations'
+            '-Wno-error=deprecated-declarations',
          ],
        },
      }]
    ]
  },
  'targets': [
    {
      'target_name': 'alts_test_util',
      'type': 'static_library',
      'dependencies': [
        'grpc',
      ],
      'sources': [
        'test/core/tsi/alts/crypt/gsec_test_util.cc',
        'test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc',
      ],
    },
    {
      'target_name': 'gpr',
      'type': 'static_library',
@ -187,9 +198,6 @@
        'src/core/lib/gpr/sync.cc',
        'src/core/lib/gpr/sync_posix.cc',
        'src/core/lib/gpr/sync_windows.cc',
        'src/core/lib/gpr/thd.cc',
        'src/core/lib/gpr/thd_posix.cc',
        'src/core/lib/gpr/thd_windows.cc',
        'src/core/lib/gpr/time.cc',
        'src/core/lib/gpr/time_posix.cc',
        'src/core/lib/gpr/time_precise.cc',
@ -199,6 +207,8 @@
        'src/core/lib/gpr/tmpfile_posix.cc',
        'src/core/lib/gpr/tmpfile_windows.cc',
        'src/core/lib/gpr/wrap_memcpy.cc',
        'src/core/lib/gprpp/thd_posix.cc',
        'src/core/lib/gprpp/thd_windows.cc',
        'src/core/lib/profiling/basic_timers.cc',
        'src/core/lib/profiling/stap_timers.cc',
      ],
@ -321,7 +331,6 @@
        'src/core/lib/slice/percent_encoding.cc',
        'src/core/lib/slice/slice.cc',
        'src/core/lib/slice/slice_buffer.cc',
        'src/core/lib/slice/slice_hash_table.cc',
        'src/core/lib/slice/slice_intern.cc',
        'src/core/lib/slice/slice_string_helpers.cc',
        'src/core/lib/surface/api_trace.cc',
@ -352,6 +361,7 @@
        'src/core/lib/transport/service_config.cc',
        'src/core/lib/transport/static_metadata.cc',
        'src/core/lib/transport/status_conversion.cc',
        'src/core/lib/transport/status_metadata.cc',
        'src/core/lib/transport/timeout_encoding.cc',
        'src/core/lib/transport/transport.cc',
        'src/core/lib/transport/transport_op_string.cc',
@ -386,6 +396,7 @@
        'src/core/ext/filters/http/server/http_server_filter.cc',
        'src/core/lib/http/httpcli_security_connector.cc',
        'src/core/lib/security/context/security_context.cc',
        'src/core/lib/security/credentials/alts/alts_credentials.cc',
        'src/core/lib/security/credentials/composite/composite_credentials.cc',
        'src/core/lib/security/credentials/credentials.cc',
        'src/core/lib/security/credentials/credentials_metadata.cc',
@ -399,23 +410,55 @@
        'src/core/lib/security/credentials/oauth2/oauth2_credentials.cc',
        'src/core/lib/security/credentials/plugin/plugin_credentials.cc',
        'src/core/lib/security/credentials/ssl/ssl_credentials.cc',
        'src/core/lib/security/security_connector/alts_security_connector.cc',
        'src/core/lib/security/security_connector/security_connector.cc',
        'src/core/lib/security/transport/client_auth_filter.cc',
        'src/core/lib/security/transport/lb_targets_info.cc',
        'src/core/lib/security/transport/secure_endpoint.cc',
        'src/core/lib/security/transport/security_connector.cc',
        'src/core/lib/security/transport/security_handshaker.cc',
        'src/core/lib/security/transport/server_auth_filter.cc',
        'src/core/lib/security/transport/target_authority_table.cc',
        'src/core/lib/security/transport/tsi_error.cc',
        'src/core/lib/security/util/json_util.cc',
        'src/core/lib/surface/init_secure.cc',
-        'src/core/tsi/alts_transport_security.cc',
+        'src/core/tsi/alts/crypt/aes_gcm.cc',
-        'src/core/tsi/fake_transport_security.cc',
+        'src/core/tsi/alts/crypt/gsec.cc',
-        'src/core/tsi/ssl_transport_security.cc',
+        'src/core/tsi/alts/frame_protector/alts_counter.cc',
-        'src/core/tsi/transport_security_grpc.cc',
+        'src/core/tsi/alts/frame_protector/alts_crypter.cc',
        'src/core/tsi/alts/frame_protector/alts_frame_protector.cc',
        'src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc',
        'src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc',
        'src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc',
        'src/core/tsi/alts/frame_protector/frame_handler.cc',
        'src/core/tsi/alts/handshaker/alts_handshaker_client.cc',
        'src/core/tsi/alts/handshaker/alts_tsi_event.cc',
        'src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc',
        'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc',
        'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc',
        'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc',
        'src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc',
        'src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc',
        'src/core/lib/security/credentials/alts/check_gcp_environment.cc',
        'src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc',
        'src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc',
        'src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc',
        'src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc',
        'src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc',
        'src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc',
        'src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc',
        'src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc',
        'src/core/tsi/alts/handshaker/alts_tsi_utils.cc',
        'src/core/tsi/alts/handshaker/transport_security_common_api.cc',
        'src/core/tsi/alts/handshaker/altscontext.pb.c',
        'src/core/tsi/alts/handshaker/handshaker.pb.c',
        'src/core/tsi/alts/handshaker/transport_security_common.pb.c',
        'third_party/nanopb/pb_common.c',
        'third_party/nanopb/pb_decode.c',
        'third_party/nanopb/pb_encode.c',
        'src/core/tsi/transport_security.cc',
        'src/core/tsi/transport_security_adapter.cc',
-        'src/core/ext/transport/chttp2/server/chttp2_server.cc',
+        'src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
-        'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
+        'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc',
        'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
        'src/core/ext/filters/client_channel/backup_poller.cc',
        'src/core/ext/filters/client_channel/channel_connectivity.cc',
        'src/core/ext/filters/client_channel/client_channel.cc',
@ -427,21 +470,26 @@
        'src/core/ext/filters/client_channel/lb_policy.cc',
        'src/core/ext/filters/client_channel/lb_policy_factory.cc',
        'src/core/ext/filters/client_channel/lb_policy_registry.cc',
        'src/core/ext/filters/client_channel/method_params.cc',
        'src/core/ext/filters/client_channel/parse_address.cc',
        'src/core/ext/filters/client_channel/proxy_mapper.cc',
        'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
        'src/core/ext/filters/client_channel/resolver.cc',
        'src/core/ext/filters/client_channel/resolver_registry.cc',
        'src/core/ext/filters/client_channel/retry_throttle.cc',
        'src/core/ext/filters/client_channel/status_util.cc',
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_index.cc',
        'src/core/ext/filters/client_channel/uri_parser.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
-        'src/core/ext/transport/chttp2/client/chttp2_connector.cc',
+        'src/core/tsi/alts_transport_security.cc',
        'src/core/tsi/fake_transport_security.cc',
        'src/core/tsi/ssl_transport_security.cc',
        'src/core/tsi/transport_security_grpc.cc',
        'src/core/ext/transport/chttp2/server/chttp2_server.cc',
        'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc',
        'src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc',
        'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc',
        'src/core/ext/transport/chttp2/client/insecure/channel_create.cc',
        'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc',
        'src/core/ext/transport/inproc/inproc_plugin.cc',
        'src/core/ext/transport/inproc/inproc_transport.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc',
@ -450,9 +498,6 @@
        'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
        'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
        'third_party/nanopb/pb_common.c',
        'third_party/nanopb/pb_decode.c',
        'third_party/nanopb/pb_encode.c',
        'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
        'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
        'src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc',
@ -618,7 +663,6 @@
        'src/core/lib/slice/percent_encoding.cc',
        'src/core/lib/slice/slice.cc',
        'src/core/lib/slice/slice_buffer.cc',
        'src/core/lib/slice/slice_hash_table.cc',
        'src/core/lib/slice/slice_intern.cc',
        'src/core/lib/slice/slice_string_helpers.cc',
        'src/core/lib/surface/api_trace.cc',
@ -649,6 +693,7 @@
        'src/core/lib/transport/service_config.cc',
        'src/core/lib/transport/static_metadata.cc',
        'src/core/lib/transport/status_conversion.cc',
        'src/core/lib/transport/status_metadata.cc',
        'src/core/lib/transport/timeout_encoding.cc',
        'src/core/lib/transport/transport.cc',
        'src/core/lib/transport/transport_op_string.cc',
@ -664,12 +709,14 @@
        'src/core/ext/filters/client_channel/lb_policy.cc',
        'src/core/ext/filters/client_channel/lb_policy_factory.cc',
        'src/core/ext/filters/client_channel/lb_policy_registry.cc',
        'src/core/ext/filters/client_channel/method_params.cc',
        'src/core/ext/filters/client_channel/parse_address.cc',
        'src/core/ext/filters/client_channel/proxy_mapper.cc',
        'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
        'src/core/ext/filters/client_channel/resolver.cc',
        'src/core/ext/filters/client_channel/resolver_registry.cc',
        'src/core/ext/filters/client_channel/retry_throttle.cc',
        'src/core/ext/filters/client_channel/status_util.cc',
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_index.cc',
        'src/core/ext/filters/client_channel/uri_parser.cc',
@ -833,7 +880,6 @@
        'src/core/lib/slice/percent_encoding.cc',
        'src/core/lib/slice/slice.cc',
        'src/core/lib/slice/slice_buffer.cc',
        'src/core/lib/slice/slice_hash_table.cc',
        'src/core/lib/slice/slice_intern.cc',
        'src/core/lib/slice/slice_string_helpers.cc',
        'src/core/lib/surface/api_trace.cc',
@ -864,6 +910,7 @@
        'src/core/lib/transport/service_config.cc',
        'src/core/lib/transport/static_metadata.cc',
        'src/core/lib/transport/status_conversion.cc',
        'src/core/lib/transport/status_metadata.cc',
        'src/core/lib/transport/timeout_encoding.cc',
        'src/core/lib/transport/transport.cc',
        'src/core/lib/transport/transport_op_string.cc',
@ -879,12 +926,14 @@
        'src/core/ext/filters/client_channel/lb_policy.cc',
        'src/core/ext/filters/client_channel/lb_policy_factory.cc',
        'src/core/ext/filters/client_channel/lb_policy_registry.cc',
        'src/core/ext/filters/client_channel/method_params.cc',
        'src/core/ext/filters/client_channel/parse_address.cc',
        'src/core/ext/filters/client_channel/proxy_mapper.cc',
        'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
        'src/core/ext/filters/client_channel/resolver.cc',
        'src/core/ext/filters/client_channel/resolver_registry.cc',
        'src/core/ext/filters/client_channel/retry_throttle.cc',
        'src/core/ext/filters/client_channel/status_util.cc',
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_index.cc',
        'src/core/ext/filters/client_channel/uri_parser.cc',
@ -1027,7 +1076,6 @@
        'src/core/lib/slice/percent_encoding.cc',
        'src/core/lib/slice/slice.cc',
        'src/core/lib/slice/slice_buffer.cc',
        'src/core/lib/slice/slice_hash_table.cc',
        'src/core/lib/slice/slice_intern.cc',
        'src/core/lib/slice/slice_string_helpers.cc',
        'src/core/lib/surface/api_trace.cc',
@ -1058,6 +1106,7 @@
        'src/core/lib/transport/service_config.cc',
        'src/core/lib/transport/static_metadata.cc',
        'src/core/lib/transport/status_conversion.cc',
        'src/core/lib/transport/status_metadata.cc',
        'src/core/lib/transport/timeout_encoding.cc',
        'src/core/lib/transport/transport.cc',
        'src/core/lib/transport/transport_op_string.cc',
@ -1106,12 +1155,14 @@
        'src/core/ext/filters/client_channel/lb_policy.cc',
        'src/core/ext/filters/client_channel/lb_policy_factory.cc',
        'src/core/ext/filters/client_channel/lb_policy_registry.cc',
        'src/core/ext/filters/client_channel/method_params.cc',
        'src/core/ext/filters/client_channel/parse_address.cc',
        'src/core/ext/filters/client_channel/proxy_mapper.cc',
        'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
        'src/core/ext/filters/client_channel/resolver.cc',
        'src/core/ext/filters/client_channel/resolver_registry.cc',
        'src/core/ext/filters/client_channel/retry_throttle.cc',
        'src/core/ext/filters/client_channel/status_util.cc',
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_index.cc',
        'src/core/ext/filters/client_channel/uri_parser.cc',
@ -1629,7 +1680,6 @@
        'third_party/boringssl/crypto/cpu-intel.c',
        'third_party/boringssl/crypto/cpu-ppc64le.c',
        'third_party/boringssl/crypto/crypto.c',
        'third_party/boringssl/crypto/curve25519/curve25519.c',
        'third_party/boringssl/crypto/curve25519/spake25519.c',
        'third_party/boringssl/crypto/curve25519/x25519-x86_64.c',
        'third_party/boringssl/crypto/dh/check.c',
@ -1815,6 +1865,7 @@
        'third_party/boringssl/ssl/tls13_server.cc',
        'third_party/boringssl/ssl/tls_method.cc',
        'third_party/boringssl/ssl/tls_record.cc',
        'third_party/boringssl/third_party/fiat/curve25519.c',
      ],
    },
    {
@ -1872,6 +1923,17 @@
        'third_party/boringssl/crypto/bio/bio_test.cc',
      ],
    },
    {
      'target_name': 'boringssl_buf_test_lib',
      'type': 'static_library',
      'dependencies': [
        'boringssl_test_util',
        'boringssl',
      ],
      'sources': [
        'third_party/boringssl/crypto/buf/buf_test.cc',
      ],
    },
    {
      'target_name': 'boringssl_bytestring_test_lib',
      'type': 'static_library',
@ -2482,6 +2544,21 @@
        'test/core/end2end/tests/request_with_flags.cc',
        'test/core/end2end/tests/request_with_payload.cc',
        'test/core/end2end/tests/resource_quota_server.cc',
        'test/core/end2end/tests/retry.cc',
        'test/core/end2end/tests/retry_cancellation.cc',
        'test/core/end2end/tests/retry_disabled.cc',
        'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',
        'test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc',
        'test/core/end2end/tests/retry_non_retriable_status.cc',
        'test/core/end2end/tests/retry_recv_initial_metadata.cc',
        'test/core/end2end/tests/retry_recv_message.cc',
        'test/core/end2end/tests/retry_server_pushback_delay.cc',
        'test/core/end2end/tests/retry_server_pushback_disabled.cc',
        'test/core/end2end/tests/retry_streaming.cc',
        'test/core/end2end/tests/retry_streaming_after_commit.cc',
        'test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc',
        'test/core/end2end/tests/retry_throttled.cc',
        'test/core/end2end/tests/retry_too_many_attempts.cc',
        'test/core/end2end/tests/server_finishes_request.cc',
        'test/core/end2end/tests/shutdown_finishes_calls.cc',
        'test/core/end2end/tests/shutdown_finishes_tags.cc',
@ -2555,6 +2632,21 @@
        'test/core/end2end/tests/request_with_flags.cc',
        'test/core/end2end/tests/request_with_payload.cc',
        'test/core/end2end/tests/resource_quota_server.cc',
        'test/core/end2end/tests/retry.cc',
        'test/core/end2end/tests/retry_cancellation.cc',
        'test/core/end2end/tests/retry_disabled.cc',
        'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',
        'test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc',
        'test/core/end2end/tests/retry_non_retriable_status.cc',
        'test/core/end2end/tests/retry_recv_initial_metadata.cc',
        'test/core/end2end/tests/retry_recv_message.cc',
        'test/core/end2end/tests/retry_server_pushback_delay.cc',
        'test/core/end2end/tests/retry_server_pushback_disabled.cc',
        'test/core/end2end/tests/retry_streaming.cc',
        'test/core/end2end/tests/retry_streaming_after_commit.cc',
        'test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc',
        'test/core/end2end/tests/retry_throttled.cc',
        'test/core/end2end/tests/retry_too_many_attempts.cc',
        'test/core/end2end/tests/server_finishes_request.cc',
        'test/core/end2end/tests/shutdown_finishes_calls.cc',
        'test/core/end2end/tests/shutdown_finishes_tags.cc',
--- a/include/grpc/byte_buffer.h
+++ b/include/grpc/byte_buffer.h
@ -19,6 +19,8 @@
 #ifndef GRPC_BYTE_BUFFER_H
 #define GRPC_BYTE_BUFFER_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/byte_buffer.h>
 #include <grpc/slice_buffer.h>
--- a/include/grpc/byte_buffer_reader.h
+++ b/include/grpc/byte_buffer_reader.h
@ -19,6 +19,8 @@
 #ifndef GRPC_BYTE_BUFFER_READER_H
 #define GRPC_BYTE_BUFFER_READER_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/byte_buffer_reader.h>
 #endif /* GRPC_BYTE_BUFFER_READER_H */
--- a/include/grpc/census.h
+++ b/include/grpc/census.h
@ -19,6 +19,8 @@
 #ifndef GRPC_CENSUS_H
 #define GRPC_CENSUS_H
 #include <grpc/support/port_platform.h>
 #include <grpc/grpc.h>
 #ifdef __cplusplus
--- a/include/grpc/fork.h
+++ b/include/grpc/fork.h
@ -19,6 +19,8 @@
 #ifndef GRPC_FORK_H
 #define GRPC_FORK_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/fork.h>
 #endif /* GRPC_FORK_H */
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_H
 #define GRPC_GRPC_H
 #include <grpc/support/port_platform.h>
 #include <grpc/status.h>
 #include <grpc/byte_buffer.h>
--- a/include/grpc/grpc_cronet.h
+++ b/include/grpc/grpc_cronet.h
@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_CRONET_H
 #define GRPC_GRPC_CRONET_H
 #include <grpc/support/port_platform.h>
 #include <grpc/grpc.h>
 #ifdef __cplusplus
--- a/include/grpc/grpc_posix.h
+++ b/include/grpc/grpc_posix.h
@ -19,9 +19,10 @@
 #ifndef GRPC_GRPC_POSIX_H
 #define GRPC_GRPC_POSIX_H
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/grpc_types.h>
 #include <stddef.h>
 #ifdef __cplusplus
--- a/include/grpc/grpc_security.h
+++ b/include/grpc/grpc_security.h
@ -19,6 +19,8 @@
 #ifndef GRPC_GRPC_SECURITY_H
 #define GRPC_GRPC_SECURITY_H
 #include <grpc/support/port_platform.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
--- a/include/grpc/impl/codegen/byte_buffer.h
+++ b/include/grpc/impl/codegen/byte_buffer.h
@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_BYTE_BUFFER_H
 #define GRPC_IMPL_CODEGEN_BYTE_BUFFER_H
 #include <grpc/impl/codegen/port_platform.h>
 #include <grpc/impl/codegen/grpc_types.h>
 #ifdef __cplusplus
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@ -314,6 +314,17 @@ typedef struct {
    Defaults to "blend". In the current implementation "blend" is equivalent to
    "latency". */
 #define GRPC_ARG_OPTIMIZATION_TARGET "grpc.optimization_target"
 /** If set to zero, disables retry behavior. Otherwise, transparent retries
    are enabled for all RPCs, and configurable retries are enabled when they
    are configured via the service config. For details, see:
      https://github.com/grpc/proposal/blob/master/A6-client-retries.md
 */
 #define GRPC_ARG_ENABLE_RETRIES "grpc.enable_retries"
 /** Per-RPC retry buffer size, in bytes. Default is 256 KiB. */
 #define GRPC_ARG_PER_RPC_RETRY_BUFFER_SIZE "grpc.per_rpc_retry_buffer_size"
 /** Channel arg that carries the bridged objective c object for custom metrics
 * logging filter. */
 #define GRPC_ARG_MOBILE_LOG_CONFIG "grpc.mobile_log_config"
 /** \} */
 /** Result of a grpc call. If the caller satisfies the prerequisites of a
@ -551,6 +562,8 @@ typedef struct grpc_op {
    } recv_initial_metadata;
    /** ownership of the byte buffer is moved to the caller; the caller must
        call grpc_byte_buffer_destroy on this value, or reuse it in a future op.
        The returned byte buffer will be NULL if trailing metadata was
        received instead of a message.
       */
    struct grpc_op_recv_message {
      struct grpc_byte_buffer** recv_message;
--- a/include/grpc/impl/codegen/sync.h
+++ b/include/grpc/impl/codegen/sync.h
@ -43,6 +43,7 @@ extern "C" {
 /* Platform-specific type declarations of gpr_mu and gpr_cv.   */
 #include <grpc/impl/codegen/port_platform.h>
 #include <grpc/impl/codegen/sync_generic.h>
 #if defined(GPR_POSIX_SYNC)
--- a/include/grpc/impl/codegen/sync_custom.h
+++ b/include/grpc/impl/codegen/sync_custom.h
@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_CUSTOM_H
 #define GRPC_IMPL_CODEGEN_SYNC_CUSTOM_H
 #include <grpc/impl/codegen/port_platform.h>
 #include <grpc/impl/codegen/sync_generic.h>
 /* Users defining GPR_CUSTOM_SYNC need to define the following macros. */
--- a/include/grpc/impl/codegen/sync_generic.h
+++ b/include/grpc/impl/codegen/sync_generic.h
@ -20,6 +20,8 @@
 #define GRPC_IMPL_CODEGEN_SYNC_GENERIC_H
 /* Generic type defintions for gpr_sync. */
 #include <grpc/impl/codegen/port_platform.h>
 #include <grpc/impl/codegen/atm.h>
 /* gpr_event */
--- a/include/grpc/impl/codegen/sync_posix.h
+++ b/include/grpc/impl/codegen/sync_posix.h
@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_POSIX_H
 #define GRPC_IMPL_CODEGEN_SYNC_POSIX_H
 #include <grpc/impl/codegen/port_platform.h>
 #include <grpc/impl/codegen/sync_generic.h>
 #include <pthread.h>
--- a/include/grpc/impl/codegen/sync_windows.h
+++ b/include/grpc/impl/codegen/sync_windows.h
@ -19,6 +19,8 @@
 #ifndef GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H
 #define GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H
 #include <grpc/impl/codegen/port_platform.h>
 #include <grpc/impl/codegen/sync_generic.h>
 typedef struct {
--- a/include/grpc/slice.h
+++ b/include/grpc/slice.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SLICE_H
 #define GRPC_SLICE_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/slice.h>
 #include <grpc/support/sync.h>
--- a/include/grpc/slice_buffer.h
+++ b/include/grpc/slice_buffer.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SLICE_BUFFER_H
 #define GRPC_SLICE_BUFFER_H
 #include <grpc/support/port_platform.h>
 #include <grpc/slice.h>
 #ifdef __cplusplus
--- a/include/grpc/status.h
+++ b/include/grpc/status.h
@ -19,6 +19,8 @@
 #ifndef GRPC_STATUS_H
 #define GRPC_STATUS_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/status.h>
 #endif /* GRPC_STATUS_H */
--- a/include/grpc/support/alloc.h
+++ b/include/grpc/support/alloc.h
@ -19,9 +19,9 @@
 #ifndef GRPC_SUPPORT_ALLOC_H
 #define GRPC_SUPPORT_ALLOC_H
-#include <stddef.h>
+#include <grpc/support/port_platform.h>
-#include <grpc/impl/codegen/port_platform.h>
+#include <stddef.h>
 #ifdef __cplusplus
 extern "C" {
--- a/include/grpc/support/atm.h
+++ b/include/grpc/support/atm.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_H
 #define GRPC_SUPPORT_ATM_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/atm.h>
 #endif /* GRPC_SUPPORT_ATM_H */
--- a/include/grpc/support/atm_gcc_atomic.h
+++ b/include/grpc/support/atm_gcc_atomic.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_GCC_ATOMIC_H
 #define GRPC_SUPPORT_ATM_GCC_ATOMIC_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/atm_gcc_atomic.h>
 #endif /* GRPC_SUPPORT_ATM_GCC_ATOMIC_H */
--- a/include/grpc/support/atm_gcc_sync.h
+++ b/include/grpc/support/atm_gcc_sync.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_GCC_SYNC_H
 #define GRPC_SUPPORT_ATM_GCC_SYNC_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/atm_gcc_sync.h>
 #endif /* GRPC_SUPPORT_ATM_GCC_SYNC_H */
--- a/include/grpc/support/atm_windows.h
+++ b/include/grpc/support/atm_windows.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_ATM_WINDOWS_H
 #define GRPC_SUPPORT_ATM_WINDOWS_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/atm_windows.h>
 #endif /* GRPC_SUPPORT_ATM_WINDOWS_H */
--- a/include/grpc/support/log.h
+++ b/include/grpc/support/log.h
@ -19,12 +19,12 @@
 #ifndef GRPC_SUPPORT_LOG_H
 #define GRPC_SUPPORT_LOG_H
 #include <grpc/impl/codegen/port_platform.h>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdlib.h> /* for abort() */
 #include <grpc/impl/codegen/port_platform.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/include/grpc/support/sync.h
+++ b/include/grpc/support/sync.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_H
 #define GRPC_SUPPORT_SYNC_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/gpr_types.h> /* for gpr_timespec */
 #include <grpc/impl/codegen/sync.h>
--- a/include/grpc/support/sync_custom.h
+++ b/include/grpc/support/sync_custom.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_CUSTOM_H
 #define GRPC_SUPPORT_SYNC_CUSTOM_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/sync_custom.h>
 #endif /* GRPC_SUPPORT_SYNC_CUSTOM_H */
--- a/include/grpc/support/sync_generic.h
+++ b/include/grpc/support/sync_generic.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_GENERIC_H
 #define GRPC_SUPPORT_SYNC_GENERIC_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/sync_generic.h>
 #endif /* GRPC_SUPPORT_SYNC_GENERIC_H */
--- a/include/grpc/support/sync_posix.h
+++ b/include/grpc/support/sync_posix.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_POSIX_H
 #define GRPC_SUPPORT_SYNC_POSIX_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/sync_posix.h>
 #endif /* GRPC_SUPPORT_SYNC_POSIX_H */
--- a/include/grpc/support/sync_windows.h
+++ b/include/grpc/support/sync_windows.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_SYNC_WINDOWS_H
 #define GRPC_SUPPORT_SYNC_WINDOWS_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/sync_windows.h>
 #endif /* GRPC_SUPPORT_SYNC_WINDOWS_H */
--- a/include/grpc/support/time.h
+++ b/include/grpc/support/time.h
@ -19,6 +19,8 @@
 #ifndef GRPC_SUPPORT_TIME_H
 #define GRPC_SUPPORT_TIME_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/gpr_types.h>
 #include <stddef.h>
--- a/package.xml
+++ b/package.xml
@ -13,8 +13,8 @@
 <date>2018-01-19</date>
 <time>16:06:07</time>
 <version>
-  <release>1.10.0dev</release>
+  <release>1.11.0dev</release>
-  <api>1.10.0dev</api>
+  <api>1.11.0dev</api>
 </version>
 <stability>
  <release>beta</release>
@ -90,7 +90,6 @@
    <file baseinstalldir="/" name="src/core/lib/gpr/spinlock.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/string.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/string_windows.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/thd.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/time_precise.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/tls.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/tls_gcc.h" role="src" />
@ -104,6 +103,7 @@
    <file baseinstalldir="/" name="src/core/lib/gprpp/atomic_with_std.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gprpp/manual_constructor.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gprpp/memory.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gprpp/thd.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/profiling/timers.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/alloc.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/arena.cc" role="src" />
@ -131,9 +131,6 @@
    <file baseinstalldir="/" name="src/core/lib/gpr/sync.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/sync_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/sync_windows.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/thd.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/thd_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/thd_windows.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/time.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/time_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/time_precise.cc" role="src" />
@ -143,6 +140,8 @@
    <file baseinstalldir="/" name="src/core/lib/gpr/tmpfile_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/tmpfile_windows.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gpr/wrap_memcpy.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gprpp/thd_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/gprpp/thd_windows.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/profiling/basic_timers.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/profiling/stap_timers.cc" role="src" />
    <file baseinstalldir="/" name="include/grpc/impl/codegen/byte_buffer.h" role="src" />
@ -205,6 +204,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/http/message_compress/message_compress_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/http/server/http_server_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/context/security_context.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/alts_credentials.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/composite/composite_credentials.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/credentials.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/fake/fake_credentials.h" role="src" />
@ -216,22 +216,47 @@
    <file baseinstalldir="/" name="src/core/lib/security/credentials/oauth2/oauth2_credentials.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/plugin/plugin_credentials.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/ssl/ssl_credentials.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/security_connector/alts_security_connector.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/security_connector/security_connector.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/auth_filters.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/lb_targets_info.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/secure_endpoint.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/security_connector.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/security_handshaker.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/target_authority_table.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/util/json_util.h" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/alts_transport_security.h" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/crypt/gsec.h" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/fake_transport_security.h" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_counter.h" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.h" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_crypter.h" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/ssl_types.h" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_frame_protector.h" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.h" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/frame_handler.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_handshaker_client.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_tsi_event.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/check_gcp_environment.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_handshaker_service_api.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_tsi_utils.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/transport_security_common_api.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/altscontext.pb.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/handshaker.pb.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/transport_security_common.pb.h" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb.h" role="src" />
    <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/tsi/transport_security.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/transport_security_adapter.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/transport_security_interface.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/chttp2_server.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/chttp2_connector.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/backup_poller.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel_factory.h" role="src" />
@ -241,6 +266,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy_registry.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/method_params.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/parse_address.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/proxy_mapper.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/proxy_mapper_registry.h" role="src" />
@ -248,11 +274,17 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver_registry.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_throttle.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/status_util.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_index.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/uri_parser.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/chttp2_connector.h" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts_transport_security.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/fake_transport_security.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/ssl_types.h" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/chttp2_server.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/inproc/inproc_transport.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/avl/avl.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/backoff/backoff.h" role="src" />
@ -352,6 +384,7 @@
    <file baseinstalldir="/" name="src/core/lib/slice/slice_hash_table.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice_internal.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice_string_helpers.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice_weak_hash_table.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/api_trace.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/call.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/call_test_only.h" role="src" />
@ -376,20 +409,16 @@
    <file baseinstalldir="/" name="src/core/lib/transport/service_config.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/static_metadata.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/status_conversion.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/status_metadata.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/timeout_encoding.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/transport.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/transport_impl.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/debug/trace.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb.h" role="src" />
    <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/filters/client_channel/resolver/fake/fake_resolver.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/subchannel_list.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" role="src" />
@ -501,7 +530,6 @@
    <file baseinstalldir="/" name="src/core/lib/slice/percent_encoding.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice_buffer.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice_hash_table.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice_intern.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/slice/slice_string_helpers.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/api_trace.cc" role="src" />
@ -532,6 +560,7 @@
    <file baseinstalldir="/" name="src/core/lib/transport/service_config.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/static_metadata.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/status_conversion.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/status_metadata.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/timeout_encoding.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/transport.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/transport_op_string.cc" role="src" />
@ -566,6 +595,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/http/server/http_server_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/http/httpcli_security_connector.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/context/security_context.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/alts_credentials.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/composite/composite_credentials.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/credentials.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/credentials_metadata.cc" role="src" />
@ -579,23 +609,55 @@
    <file baseinstalldir="/" name="src/core/lib/security/credentials/oauth2/oauth2_credentials.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/plugin/plugin_credentials.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/ssl/ssl_credentials.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/security_connector/alts_security_connector.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/security_connector/security_connector.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/client_auth_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/lb_targets_info.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/secure_endpoint.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/security_connector.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/security_handshaker.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/server_auth_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/target_authority_table.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/util/json_util.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/init_secure.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/alts_transport_security.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/crypt/aes_gcm.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/fake_transport_security.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/crypt/gsec.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_counter.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_crypter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_frame_protector.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_record_protocol_crypter_common.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/frame_protector/frame_handler.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_handshaker_client.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_tsi_event.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/check_gcp_environment.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/alts_tsi_utils.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/transport_security_common_api.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/altscontext.pb.c" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/handshaker.pb.c" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/alts/handshaker/transport_security_common.pb.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" />
    <file baseinstalldir="/" name="src/core/tsi/transport_security.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/transport_security_adapter.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/chttp2_server.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/chttp2_connector.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/backup_poller.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/channel_connectivity.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/client_channel.cc" role="src" />
@ -607,21 +669,26 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy_factory.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy_registry.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/method_params.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/parse_address.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/proxy_mapper.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/proxy_mapper_registry.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver_registry.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/retry_throttle.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/status_util.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_index.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/uri_parser.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/chttp2_connector.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/tsi/alts_transport_security.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/fake_transport_security.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.cc" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/transport_security_grpc.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/chttp2_server.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/inproc/inproc_plugin.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/inproc/inproc_transport.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc" role="src" />
@ -630,9 +697,6 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.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" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc" role="src" />
@ -657,23 +721,82 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/cipher_extra/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/conf/conf_def.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/conf/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/curve25519/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/err/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/evp/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/aes/aes.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/aes/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/aes/key_wrap.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/aes/mode_wrappers.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/add.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/asm/x86_64-gcc.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/bn.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/bytes.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/cmp.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/ctx.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/div.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/gcd.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/generic.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/jacobi.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/montgomery.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/montgomery_inv.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/mul.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/prime.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/random.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/shift.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/bn/sqrt.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/cipher/aead.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/cipher/cipher.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/cipher/e_aes.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/cipher/e_des.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/cipher/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/delocate.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/des/des.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/des/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/digest/digest.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/digest/digests.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/digest/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/digest/md32_common.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/ec.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/ec_key.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/oct.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/p224-64.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/p256-64.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/simple.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/util-64.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ec/wnaf.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/hmac/hmac.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/md4/md4.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/md5/md5.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/cbc.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/cfb.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/ctr.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/gcm.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/ofb.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/modes/polyval.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rand/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rand/rand.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rand/urandom.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rsa/blinding.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rsa/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rsa/padding.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rsa/rsa.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/sha1-altivec.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/sha1.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/sha256.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/fipsmodule/sha/sha512.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/obj/obj_dat.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/pkcs7/internal.h" role="src" />
@ -759,6 +882,7 @@
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/x509_vfy.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/include/openssl/x509v3.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/ssl/internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/third_party/fiat/internal.h" role="src" />
    <file baseinstalldir="/" name="src/boringssl/err_data.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/a_bitstr.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/asn1/a_bool.c" role="src" />
@ -828,7 +952,6 @@
    <file baseinstalldir="/" name="third_party/boringssl/crypto/cpu-intel.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/cpu-ppc64le.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/crypto.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/curve25519/curve25519.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/curve25519/spake25519.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/curve25519/x25519-x86_64.c" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/crypto/dh/check.c" role="src" />
@ -1014,6 +1137,7 @@
    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls13_server.cc" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls_method.cc" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/ssl/tls_record.cc" role="src" />
    <file baseinstalldir="/" name="third_party/boringssl/third_party/fiat/curve25519.c" role="src" />
    <file baseinstalldir="/" name="third_party/zlib/crc32.h" role="src" />
    <file baseinstalldir="/" name="third_party/zlib/deflate.h" role="src" />
    <file baseinstalldir="/" name="third_party/zlib/gzguts.h" role="src" />
--- a/setup.py
+++ b/setup.py
@ -118,6 +118,7 @@ if EXTRA_ENV_COMPILE_ARGS is None:
    EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions'
  elif "darwin" in sys.platform:
    EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
 EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_16BIT'	
 if EXTRA_ENV_LINK_ARGS is None:
  EXTRA_ENV_LINK_ARGS = ''
@ -160,7 +161,7 @@ if "win32" in sys.platform:
 DEFINE_MACROS = (
    ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
-    ('GPR_BACKWARDS_COMPATIBILITY_MODE', 1),)
+    ('GPR_BACKWARDS_COMPATIBILITY_MODE', 1))
 if "win32" in sys.platform:
  # TODO(zyc): Re-enble c-ares on x64 and x86 windows after fixing the
  # ares_library_init compilation issue
--- a/src/boringssl/crypto_test_data.cc
+++ b/src/boringssl/crypto_test_data.cc
--- a/src/boringssl/err_data.c
+++ b/src/boringssl/err_data.c
@ -75,52 +75,52 @@ const uint32_t kOpenSSLReasonValues[] = {
    0xc3b00ea,
    0xc3b88d4,
    0x10320845,
-    0x10329513,
+    0x10329535,
-    0x1033151f,
+    0x10331541,
-    0x10339538,
+    0x1033955a,
-    0x1034154b,
+    0x1034156d,
-    0x10348eed,
+    0x10348efc,
    0x10350c5e,
-    0x1035955e,
+    0x10359580,
-    0x10361573,
+    0x10361595,
-    0x10369586,
+    0x103695a8,
-    0x103715a5,
+    0x103715c7,
-    0x103795be,
+    0x103795e0,
-    0x103815d3,
+    0x103815f5,
-    0x103895f1,
+    0x10389613,
-    0x10391600,
+    0x10391622,
-    0x1039961c,
+    0x1039963e,
-    0x103a1637,
+    0x103a1659,
-    0x103a9646,
+    0x103a9668,
-    0x103b1662,
+    0x103b1684,
-    0x103b967d,
+    0x103b969f,
-    0x103c1694,
+    0x103c16b6,
    0x103c80ea,
-    0x103d16a5,
+    0x103d16c7,
-    0x103d96b9,
+    0x103d96db,
-    0x103e16d8,
+    0x103e16fa,
-    0x103e96e7,
+    0x103e9709,
-    0x103f16fe,
+    0x103f1720,
-    0x103f9711,
+    0x103f9733,
    0x10400c22,
-    0x10409724,
+    0x10409746,
-    0x10411742,
+    0x10411764,
-    0x10419755,
+    0x10419777,
-    0x1042176f,
+    0x10421791,
-    0x1042977f,
+    0x104297a1,
-    0x10431793,
+    0x104317b5,
-    0x104397a9,
+    0x104397cb,
-    0x104417c1,
+    0x104417e3,
-    0x104497d6,
+    0x104497f8,
-    0x104517ea,
+    0x1045180c,
-    0x104597fc,
+    0x1045981e,
    0x104605fb,
    0x1046894d,
-    0x10471811,
+    0x10471833,
-    0x10479828,
+    0x1047984a,
-    0x1048183d,
+    0x1048185f,
-    0x1048984b,
+    0x1048986d,
-    0x10490e4f,
+    0x10490e5e,
    0x14320c05,
    0x14328c13,
    0x14330c22,
@ -128,55 +128,56 @@ const uint32_t kOpenSSLReasonValues[] = {
    0x143400ac,
    0x143480ea,
    0x18320083,
-    0x18328f43,
+    0x18328f52,
    0x183300ac,
-    0x18338f59,
+    0x18338f68,
-    0x18340f6d,
+    0x18340f7c,
    0x183480ea,
-    0x18350f82,
+    0x18350f91,
-    0x18358f9a,
+    0x18358fa9,
-    0x18360faf,
+    0x18360fbe,
-    0x18368fc3,
+    0x18368fd2,
-    0x18370fe7,
+    0x18370ff6,
-    0x18378ffd,
+    0x1837900c,
-    0x18381011,
+    0x18381020,
-    0x18389021,
+    0x18389030,
    0x18390a73,
-    0x18399031,
+    0x18399040,
-    0x183a1059,
+    0x183a1068,
-    0x183a907f,
+    0x183a908e,
    0x183b0c6a,
-    0x183b90b4,
+    0x183b90c3,
-    0x183c10c6,
+    0x183c10d5,
-    0x183c90d1,
+    0x183c90e0,
-    0x183d10e1,
+    0x183d10f0,
-    0x183d90f2,
+    0x183d9101,
-    0x183e1103,
+    0x183e1112,
-    0x183e9115,
+    0x183e9124,
-    0x183f113e,
+    0x183f114d,
-    0x183f9157,
+    0x183f9166,
-    0x1840116f,
+    0x1840117e,
    0x184086d3,
-    0x184110a2,
+    0x184110b1,
-    0x1841906d,
+    0x1841907c,
-    0x1842108c,
+    0x1842109b,
-    0x18429046,
+    0x18429055,
-    0x20321196,
+    0x203211b8,
-    0x243211a2,
+    0x203291a5,
    0x243211c4,
    0x24328993,
-    0x243311b4,
+    0x243311d6,
-    0x243391c1,
+    0x243391e3,
-    0x243411ce,
+    0x243411f0,
-    0x243491e0,
+    0x24349202,
-    0x243511ef,
+    0x24351211,
-    0x2435920c,
+    0x2435922e,
-    0x24361219,
+    0x2436123b,
-    0x24369227,
+    0x24369249,
-    0x24371235,
+    0x24371257,
-    0x24379243,
+    0x24379265,
-    0x2438124c,
+    0x2438126e,
-    0x24389259,
+    0x2438927b,
-    0x2439126c,
+    0x2439128e,
    0x28320c52,
    0x28328c6a,
    0x28330c22,
@ -184,43 +185,43 @@ const uint32_t kOpenSSLReasonValues[] = {
    0x28340c5e,
    0x283480ac,
    0x283500ea,
-    0x2c322c30,
+    0x2c322c6c,
-    0x2c329283,
+    0x2c3292a5,
-    0x2c332c3e,
+    0x2c332c7a,
-    0x2c33ac50,
+    0x2c33ac8c,
-    0x2c342c64,
+    0x2c342ca0,
-    0x2c34ac76,
+    0x2c34acb2,
-    0x2c352c91,
+    0x2c352ccd,
-    0x2c35aca3,
+    0x2c35acdf,
-    0x2c362cb6,
+    0x2c362cf2,
    0x2c36832d,
-    0x2c372cc3,
+    0x2c372cff,
-    0x2c37acd5,
+    0x2c37ad11,
-    0x2c382cfa,
+    0x2c382d36,
-    0x2c38ad11,
+    0x2c38ad4d,
-    0x2c392d1f,
+    0x2c392d5b,
-    0x2c39ad2f,
+    0x2c39ad6b,
-    0x2c3a2d41,
+    0x2c3a2d7d,
-    0x2c3aad55,
+    0x2c3aad91,
-    0x2c3b2d66,
+    0x2c3b2da2,
-    0x2c3bad85,
+    0x2c3badc1,
-    0x2c3c1295,
+    0x2c3c12b7,
-    0x2c3c92ab,
+    0x2c3c92cd,
-    0x2c3d2d99,
+    0x2c3d2dd5,
-    0x2c3d92c4,
+    0x2c3d92e6,
-    0x2c3e2db6,
+    0x2c3e2df2,
-    0x2c3eadc4,
+    0x2c3eae00,
-    0x2c3f2ddc,
+    0x2c3f2e18,
-    0x2c3fadf4,
+    0x2c3fae30,
-    0x2c402e01,
+    0x2c402e3d,
-    0x2c409196,
+    0x2c4091b8,
-    0x2c412e12,
+    0x2c412e4e,
-    0x2c41ae25,
+    0x2c41ae61,
-    0x2c42116f,
+    0x2c42117e,
-    0x2c42ae36,
+    0x2c42ae72,
    0x2c430720,
-    0x2c43ad77,
+    0x2c43adb3,
-    0x2c442ce8,
+    0x2c442d24,
    0x30320000,
    0x30328015,
    0x3033001f,
@ -335,238 +336,240 @@ const uint32_t kOpenSSLReasonValues[] = {
    0x3c380dc0,
    0x3c388dd4,
    0x3c390c6a,
-    0x3c398de8,
+    0x3c398df7,
-    0x3c3a0dfc,
+    0x3c3a0e0b,
    0x3c3a890d,
-    0x3c3b0e0c,
+    0x3c3b0e1b,
-    0x3c3b8e27,
+    0x3c3b8e36,
-    0x3c3c0e39,
+    0x3c3c0e48,
-    0x3c3c8e6c,
+    0x3c3c8e7b,
-    0x3c3d0e76,
+    0x3c3d0e85,
-    0x3c3d8e8a,
+    0x3c3d8e99,
-    0x3c3e0e98,
+    0x3c3e0ea7,
-    0x3c3e8ebd,
+    0x3c3e8ecc,
    0x3c3f0c93,
-    0x3c3f8ea6,
+    0x3c3f8eb5,
    0x3c4000ac,
    0x3c4080ea,
    0x3c410d13,
    0x3c418d52,
-    0x3c420e4f,
+    0x3c420e5e,
-    0x403218a4,
+    0x3c428de8,
-    0x403298ba,
+    0x403218c6,
-    0x403318e8,
+    0x403298dc,
-    0x403398f2,
+    0x4033190a,
-    0x40341909,
+    0x40339914,
-    0x40349927,
+    0x4034192b,
-    0x40351937,
+    0x40349949,
-    0x40359949,
+    0x40351959,
-    0x40361956,
+    0x4035996b,
-    0x40369962,
+    0x40361978,
-    0x40371977,
+    0x40369984,
-    0x40379989,
+    0x40371999,
-    0x40381994,
+    0x403799ab,
-    0x403899a6,
+    0x403819b6,
-    0x40390eed,
+    0x403899c8,
-    0x403999b6,
+    0x40390efc,
-    0x403a19c9,
+    0x403999d8,
-    0x403a99ea,
+    0x403a19eb,
-    0x403b19fb,
+    0x403a9a0c,
-    0x403b9a0b,
+    0x403b1a1d,
    0x403b9a2d,
    0x403c0064,
    0x403c8083,
-    0x403d1a8f,
+    0x403d1ab1,
-    0x403d9aa5,
+    0x403d9ac7,
-    0x403e1ab4,
+    0x403e1ad6,
-    0x403e9aec,
+    0x403e9b0e,
-    0x403f1b06,
+    0x403f1b28,
-    0x403f9b14,
+    0x403f9b36,
-    0x40401b29,
+    0x40401b4b,
-    0x40409b3d,
+    0x40409b5f,
-    0x40411b5a,
+    0x40411b7c,
-    0x40419b75,
+    0x40419b97,
-    0x40421b8e,
+    0x40421bb0,
-    0x40429ba1,
+    0x40429bc3,
-    0x40431bb5,
+    0x40431bd7,
-    0x40439bcd,
+    0x40439bef,
-    0x40441be4,
+    0x40441c06,
    0x404480ac,
-    0x40451bf9,
+    0x40451c1b,
-    0x40459c0b,
+    0x40459c2d,
-    0x40461c2f,
+    0x40461c51,
-    0x40469c4f,
+    0x40469c71,
-    0x40471c5d,
+    0x40471c7f,
-    0x40479c84,
+    0x40479ca6,
-    0x40481cc1,
+    0x40481ce3,
-    0x40489cda,
+    0x40489d16,
-    0x40491cf1,
+    0x40491d2d,
-    0x40499d0b,
+    0x40499d47,
-    0x404a1d22,
+    0x404a1d5e,
-    0x404a9d40,
+    0x404a9d7c,
-    0x404b1d58,
+    0x404b1d94,
-    0x404b9d6f,
+    0x404b9dab,
-    0x404c1d85,
+    0x404c1dc1,
-    0x404c9d97,
+    0x404c9dd3,
-    0x404d1db8,
+    0x404d1df4,
-    0x404d9dda,
+    0x404d9e16,
-    0x404e1dee,
+    0x404e1e2a,
-    0x404e9dfb,
+    0x404e9e37,
-    0x404f1e28,
+    0x404f1e64,
-    0x404f9e51,
+    0x404f9e8d,
-    0x40501e8c,
+    0x40501ec8,
-    0x40509ea0,
+    0x40509edc,
-    0x40511ebb,
+    0x40511ef7,
-    0x40521ecb,
+    0x40521f07,
-    0x40529eef,
+    0x40529f2b,
-    0x40531f07,
+    0x40531f43,
-    0x40539f1a,
+    0x40539f56,
-    0x40541f2f,
+    0x40541f6b,
-    0x40549f52,
+    0x40549f8e,
-    0x40551f60,
+    0x40551f9c,
-    0x40559f7d,
+    0x40559fb9,
-    0x40561f8a,
+    0x40561fc6,
-    0x40569fa3,
+    0x40569fdf,
-    0x40571fbb,
+    0x40571ff7,
-    0x40579fce,
+    0x4057a00a,
-    0x40581fe3,
+    0x4058201f,
-    0x4058a00a,
+    0x4058a046,
-    0x40592039,
+    0x40592075,
-    0x4059a066,
+    0x4059a0a2,
-    0x405a207a,
+    0x405a20b6,
-    0x405aa08a,
+    0x405aa0c6,
-    0x405b20a2,
+    0x405b20de,
-    0x405ba0b3,
+    0x405ba0ef,
-    0x405c20c6,
+    0x405c2102,
-    0x405ca105,
+    0x405ca141,
-    0x405d2112,
+    0x405d214e,
-    0x405da129,
+    0x405da165,
-    0x405e2167,
+    0x405e21a3,
    0x405e8ab1,
-    0x405f2188,
+    0x405f21c4,
-    0x405fa195,
+    0x405fa1d1,
-    0x406021a3,
+    0x406021df,
-    0x4060a1c5,
+    0x4060a201,
-    0x40612209,
+    0x40612245,
-    0x4061a241,
+    0x4061a27d,
-    0x40622258,
+    0x40622294,
-    0x4062a269,
+    0x4062a2a5,
-    0x4063227a,
+    0x406322b6,
-    0x4063a28f,
+    0x4063a2cb,
-    0x406422a6,
+    0x406422e2,
-    0x4064a2d2,
+    0x4064a30e,
-    0x406522ed,
+    0x40652329,
-    0x4065a304,
+    0x4065a340,
-    0x4066231c,
+    0x40662358,
-    0x4066a346,
+    0x4066a382,
-    0x40672371,
+    0x406723ad,
-    0x4067a392,
+    0x4067a3ce,
-    0x406823b9,
+    0x406823f5,
-    0x4068a3da,
+    0x4068a416,
-    0x4069240c,
+    0x40692448,
-    0x4069a43a,
+    0x4069a476,
-    0x406a245b,
+    0x406a2497,
-    0x406aa47b,
+    0x406aa4b7,
-    0x406b2603,
+    0x406b263f,
-    0x406ba626,
+    0x406ba662,
-    0x406c263c,
+    0x406c2678,
-    0x406ca8b7,
+    0x406ca8f3,
-    0x406d28e6,
+    0x406d2922,
-    0x406da90e,
+    0x406da94a,
-    0x406e293c,
+    0x406e2978,
-    0x406ea989,
+    0x406ea9c5,
-    0x406f29a8,
+    0x406f29e4,
-    0x406fa9e0,
+    0x406faa1c,
-    0x407029f3,
+    0x40702a2f,
-    0x4070aa10,
+    0x4070aa4c,
    0x40710800,
-    0x4071aa22,
+    0x4071aa5e,
-    0x40722a35,
+    0x40722a71,
-    0x4072aa4e,
+    0x4072aa8a,
-    0x40732a66,
+    0x40732aa2,
-    0x40739482,
+    0x407394a4,
-    0x40742a7a,
+    0x40742ab6,
-    0x4074aa94,
+    0x4074aad0,
-    0x40752aa5,
+    0x40752ae1,
-    0x4075aab9,
+    0x4075aaf5,
-    0x40762ac7,
+    0x40762b03,
-    0x40769259,
+    0x4076927b,
-    0x40772aec,
+    0x40772b28,
-    0x4077ab0e,
+    0x4077ab4a,
-    0x40782b29,
+    0x40782b65,
-    0x4078ab62,
+    0x4078ab9e,
-    0x40792b79,
+    0x40792bb5,
-    0x4079ab8f,
+    0x4079abcb,
-    0x407a2b9b,
+    0x407a2bd7,
-    0x407aabae,
+    0x407aabea,
-    0x407b2bc3,
+    0x407b2bff,
-    0x407babd5,
+    0x407bac11,
-    0x407c2c06,
+    0x407c2c42,
-    0x407cac0f,
+    0x407cac4b,
-    0x407d23f5,
+    0x407d2431,
-    0x407d9e61,
+    0x407d9e9d,
-    0x407e2b3e,
+    0x407e2b7a,
-    0x407ea01a,
+    0x407ea056,
-    0x407f1c71,
+    0x407f1c93,
-    0x407f9a31,
+    0x407f9a53,
-    0x40801e38,
+    0x40801e74,
-    0x40809c99,
+    0x40809cbb,
-    0x40811edd,
+    0x40811f19,
-    0x40819e12,
+    0x40819e4e,
-    0x40822927,
+    0x40822963,
-    0x40829a17,
+    0x40829a39,
-    0x40831ff5,
+    0x40832031,
-    0x4083a2b7,
+    0x4083a2f3,
-    0x40841cad,
+    0x40841ccf,
-    0x4084a052,
+    0x4084a08e,
-    0x408520d7,
+    0x40852113,
-    0x4085a1ed,
+    0x4085a229,
-    0x40862149,
+    0x40862185,
-    0x40869e7b,
+    0x40869eb7,
-    0x4087296d,
+    0x408729a9,
-    0x4087a21e,
+    0x4087a25a,
-    0x40881a78,
+    0x40881a9a,
-    0x4088a3a5,
+    0x4088a3e1,
-    0x40891ac7,
+    0x40891ae9,
-    0x40899a54,
+    0x40899a76,
-    0x408a265c,
+    0x408a2698,
-    0x408a9862,
+    0x408a9884,
-    0x408b2bea,
+    0x408b2c26,
-    0x408ba9bd,
+    0x408ba9f9,
-    0x408c20e7,
+    0x408c2123,
-    0x408c987e,
+    0x408c98a0,
-    0x41f4252e,
+    0x408d1cfc,
-    0x41f925c0,
+    0x41f4256a,
-    0x41fe24b3,
+    0x41f925fc,
-    0x41fea6a8,
+    0x41fe24ef,
-    0x41ff2799,
+    0x41fea6e4,
-    0x42032547,
+    0x41ff27d5,
-    0x42082569,
+    0x42032583,
-    0x4208a5a5,
+    0x420825a5,
-    0x42092497,
+    0x4208a5e1,
-    0x4209a5df,
+    0x420924d3,
-    0x420a24ee,
+    0x4209a61b,
-    0x420aa4ce,
+    0x420a252a,
-    0x420b250e,
+    0x420aa50a,
-    0x420ba587,
+    0x420b254a,
-    0x420c27b5,
+    0x420ba5c3,
-    0x420ca675,
+    0x420c27f1,
-    0x420d268f,
+    0x420ca6b1,
-    0x420da6c6,
+    0x420d26cb,
-    0x421226e0,
+    0x420da702,
-    0x4217277c,
+    0x4212271c,
-    0x4217a722,
+    0x421727b8,
-    0x421c2744,
+    0x4217a75e,
-    0x421f26ff,
+    0x421c2780,
-    0x422127cc,
+    0x421f273b,
-    0x4226275f,
+    0x42212808,
-    0x422b289b,
+    0x4226279b,
-    0x422ba849,
+    0x422b28d7,
-    0x422c2883,
+    0x422ba885,
-    0x422ca808,
+    0x422c28bf,
-    0x422d27e7,
+    0x422ca844,
-    0x422da868,
+    0x422d2823,
-    0x422e282e,
+    0x422da8a4,
-    0x422ea954,
+    0x422e286a,
    0x422ea990,
    0x4432072b,
    0x4432873a,
    0x44330746,
@ -584,114 +587,114 @@ const uint32_t kOpenSSLReasonValues[] = {
    0x44390800,
    0x4439880e,
    0x443a0821,
-    0x48321283,
+    0x483212a5,
-    0x48329295,
+    0x483292b7,
-    0x483312ab,
+    0x483312cd,
-    0x483392c4,
+    0x483392e6,
-    0x4c3212e9,
+    0x4c32130b,
-    0x4c3292f9,
+    0x4c32931b,
-    0x4c33130c,
+    0x4c33132e,
-    0x4c33932c,
+    0x4c33934e,
    0x4c3400ac,
    0x4c3480ea,
-    0x4c351338,
+    0x4c35135a,
-    0x4c359346,
+    0x4c359368,
-    0x4c361362,
+    0x4c361384,
-    0x4c369375,
+    0x4c369397,
-    0x4c371384,
+    0x4c3713a6,
-    0x4c379392,
+    0x4c3793b4,
-    0x4c3813a7,
+    0x4c3813c9,
-    0x4c3893b3,
+    0x4c3893d5,
-    0x4c3913d3,
+    0x4c3913f5,
-    0x4c3993fd,
+    0x4c39941f,
-    0x4c3a1416,
+    0x4c3a1438,
-    0x4c3a942f,
+    0x4c3a9451,
    0x4c3b05fb,
-    0x4c3b9448,
+    0x4c3b946a,
-    0x4c3c145a,
+    0x4c3c147c,
-    0x4c3c9469,
+    0x4c3c948b,
-    0x4c3d1482,
+    0x4c3d14a4,
    0x4c3d8c45,
-    0x4c3e14db,
+    0x4c3e14fd,
-    0x4c3e9491,
+    0x4c3e94b3,
-    0x4c3f14fd,
+    0x4c3f151f,
-    0x4c3f9259,
+    0x4c3f927b,
-    0x4c4014a7,
+    0x4c4014c9,
-    0x4c4092d5,
+    0x4c4092f7,
-    0x4c4114cb,
+    0x4c4114ed,
-    0x50322e48,
+    0x50322e84,
-    0x5032ae57,
+    0x5032ae93,
-    0x50332e62,
+    0x50332e9e,
-    0x5033ae72,
+    0x5033aeae,
-    0x50342e8b,
+    0x50342ec7,
-    0x5034aea5,
+    0x5034aee1,
-    0x50352eb3,
+    0x50352eef,
-    0x5035aec9,
+    0x5035af05,
-    0x50362edb,
+    0x50362f17,
-    0x5036aef1,
+    0x5036af2d,
-    0x50372f0a,
+    0x50372f46,
-    0x5037af1d,
+    0x5037af59,
-    0x50382f35,
+    0x50382f71,
-    0x5038af46,
+    0x5038af82,
-    0x50392f5b,
+    0x50392f97,
-    0x5039af6f,
+    0x5039afab,
-    0x503a2f8f,
+    0x503a2fcb,
-    0x503aafa5,
+    0x503aafe1,
-    0x503b2fbd,
+    0x503b2ff9,
-    0x503bafcf,
+    0x503bb00b,
-    0x503c2feb,
+    0x503c3027,
-    0x503cb002,
+    0x503cb03e,
-    0x503d301b,
+    0x503d3057,
-    0x503db031,
+    0x503db06d,
-    0x503e303e,
+    0x503e307a,
-    0x503eb054,
+    0x503eb090,
-    0x503f3066,
+    0x503f30a2,
    0x503f8382,
-    0x50403079,
+    0x504030b5,
-    0x5040b089,
+    0x5040b0c5,
-    0x504130a3,
+    0x504130df,
-    0x5041b0b2,
+    0x5041b0ee,
-    0x504230cc,
+    0x50423108,
-    0x5042b0e9,
+    0x5042b125,
-    0x504330f9,
+    0x50433135,
-    0x5043b109,
+    0x5043b145,
-    0x50443118,
+    0x50443154,
    0x5044843f,
-    0x5045312c,
+    0x50453168,
-    0x5045b14a,
+    0x5045b186,
-    0x5046315d,
+    0x50463199,
-    0x5046b173,
+    0x5046b1af,
-    0x50473185,
+    0x504731c1,
-    0x5047b19a,
+    0x5047b1d6,
-    0x504831c0,
+    0x504831fc,
-    0x5048b1ce,
+    0x5048b20a,
-    0x504931e1,
+    0x5049321d,
-    0x5049b1f6,
+    0x5049b232,
-    0x504a320c,
+    0x504a3248,
-    0x504ab21c,
+    0x504ab258,
-    0x504b323c,
+    0x504b3278,
-    0x504bb24f,
+    0x504bb28b,
-    0x504c3272,
+    0x504c32ae,
-    0x504cb2a0,
+    0x504cb2dc,
-    0x504d32b2,
+    0x504d32ee,
-    0x504db2cf,
+    0x504db30b,
-    0x504e32ea,
+    0x504e3326,
-    0x504eb306,
+    0x504eb342,
-    0x504f3318,
+    0x504f3354,
-    0x504fb32f,
+    0x504fb36b,
-    0x5050333e,
+    0x5050337a,
    0x505086ef,
-    0x50513351,
+    0x5051338d,
-    0x58320f2b,
+    0x58320f3a,
-    0x68320eed,
+    0x68320efc,
    0x68328c6a,
    0x68330c7d,
-    0x68338efb,
+    0x68338f0a,
-    0x68340f0b,
+    0x68340f1a,
    0x683480ea,
-    0x6c320ec9,
+    0x6c320ed8,
    0x6c328c34,
-    0x6c330ed4,
+    0x6c330ee3,
    0x74320a19,
    0x743280ac,
    0x74330c45,
@ -721,7 +724,7 @@ const uint32_t kOpenSSLReasonValues[] = {
    0x783d8b4a,
    0x783e0aa0,
    0x783e8a52,
-    0x7c321185,
+    0x7c321194,
 };
 const size_t kOpenSSLReasonValuesLen = sizeof(kOpenSSLReasonValues) / sizeof(kOpenSSLReasonValues[0]);
@ -912,6 +915,7 @@ const char kOpenSSLReasonStringData[] =
    "INVALID_FORM\0"
    "INVALID_GROUP_ORDER\0"
    "INVALID_PRIVATE_KEY\0"
    "INVALID_SCALAR\0"
    "MISSING_PRIVATE_KEY\0"
    "NON_NAMED_CURVE\0"
    "PKPARAMETERS2GROUP_FAILURE\0"
@ -959,6 +963,7 @@ const char kOpenSSLReasonStringData[] =
    "UNKNOWN_PUBLIC_KEY_TYPE\0"
    "UNSUPPORTED_ALGORITHM\0"
    "OUTPUT_TOO_LARGE\0"
    "INVALID_OID_STRING\0"
    "UNKNOWN_NID\0"
    "BAD_BASE64_DECODE\0"
    "BAD_END_LINE\0"
@ -1094,6 +1099,7 @@ const char kOpenSSLReasonStringData[] =
    "DUPLICATE_EXTENSION\0"
    "DUPLICATE_KEY_SHARE\0"
    "ECC_CERT_NOT_FOR_SIGNING\0"
    "EMPTY_HELLO_RETRY_REQUEST\0"
    "EMS_STATE_INCONSISTENT\0"
    "ENCRYPTED_LENGTH_TOO_LONG\0"
    "ERROR_ADDING_EXTENSION\0"
--- a/src/boringssl/gen_build_yaml.py
+++ b/src/boringssl/gen_build_yaml.py
@ -67,7 +67,9 @@ class Grpc(object):
            ),
            'headers': sorted(
              map_dir(f)
-              for f in files['ssl_headers'] + files['ssl_internal_headers'] + files['crypto_headers'] + files['crypto_internal_headers']
+              # We want to include files['fips_fragments'], but not build them as objects.
              # See https://boringssl-review.googlesource.com/c/boringssl/+/16946
              for f in files['ssl_headers'] + files['ssl_internal_headers'] + files['crypto_headers'] + files['crypto_internal_headers'] + files['fips_fragments']
            ),
            'boringssl': True,
            'defaults': 'boringssl',
--- a/src/compiler/csharp_generator.cc
+++ b/src/compiler/csharp_generator.cc
@ -451,8 +451,10 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service) {
      out->Print(
          "public virtual $response$ $methodname$($request$ request, "
          "grpc::Metadata "
-          "headers = null, DateTime? deadline = null, CancellationToken "
+          "headers = null, global::System.DateTime? deadline = null, "
-          "cancellationToken = default(CancellationToken))\n",
+          "global::System.Threading.CancellationToken "
          "cancellationToken = "
          "default(global::System.Threading.CancellationToken))\n",
          "methodname", method->name(), "request",
          GetClassName(method->input_type()), "response",
          GetClassName(method->output_type()));
@ -492,8 +494,10 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service) {
    out->Print(
        "public virtual $returntype$ "
        "$methodname$($request_maybe$grpc::Metadata "
-        "headers = null, DateTime? deadline = null, CancellationToken "
+        "headers = null, global::System.DateTime? deadline = null, "
-        "cancellationToken = default(CancellationToken))\n",
+        "global::System.Threading.CancellationToken "
        "cancellationToken = "
        "default(global::System.Threading.CancellationToken))\n",
        "methodname", method_name, "request_maybe",
        GetMethodRequestParamMaybe(method), "returntype",
        GetMethodReturnTypeClient(method));
@ -675,9 +679,6 @@ grpc::string GetServices(const FileDescriptor* file, bool generate_client,
    out.Print("#pragma warning disable 1591\n");
    out.Print("#region Designer generated code\n");
    out.Print("\n");
    out.Print("using System;\n");
    out.Print("using System.Threading;\n");
    out.Print("using System.Threading.Tasks;\n");
    out.Print("using grpc = global::Grpc.Core;\n");
    out.Print("\n");
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@ -212,37 +212,49 @@ void PrintMethodImplementations(Printer* printer,
  return output;
 }
-::grpc::string GetHeader(const ServiceDescriptor* service) {
+::grpc::string GetProtocol(const ServiceDescriptor* service) {
  ::grpc::string output;
  {
    // Scope the output stream so it closes and finalizes output to the string.
    grpc::protobuf::io::StringOutputStream output_stream(&output);
    Printer printer(&output_stream, '$');
    map< ::grpc::string, ::grpc::string> vars = {
        {"service_class", ServiceClassName(service)}};
-    printer.Print(vars, "@protocol $service_class$ <NSObject>\n\n");
+  // Scope the output stream so it closes and finalizes output to the string.
  grpc::protobuf::io::StringOutputStream output_stream(&output);
  Printer printer(&output_stream, '$');
-    for (int i = 0; i < service->method_count(); i++) {
+  map< ::grpc::string, ::grpc::string> vars = {
-      PrintMethodDeclarations(&printer, service->method(i));
+      {"service_class", ServiceClassName(service)}};
    }
    printer.Print("@end\n\n");
-    printer.Print(
+  printer.Print(vars, "@protocol $service_class$ <NSObject>\n\n");
-        "/**\n"
+  for (int i = 0; i < service->method_count(); i++) {
-        " * Basic service implementation, over gRPC, that only does\n"
+    PrintMethodDeclarations(&printer, service->method(i));
        " * marshalling and parsing.\n"
        " */\n");
    printer.Print(vars,
                  "@interface $service_class$ :"
                  " GRPCProtoService<$service_class$>\n");
    printer.Print(
        "- (instancetype)initWithHost:(NSString *)host"
        " NS_DESIGNATED_INITIALIZER;\n");
    printer.Print("+ (instancetype)serviceWithHost:(NSString *)host;\n");
    printer.Print("@end\n");
  }
  printer.Print("@end\n\n");
  return output;
 }
 ::grpc::string GetInterface(const ServiceDescriptor* service) {
  ::grpc::string output;
  // Scope the output stream so it closes and finalizes output to the string.
  grpc::protobuf::io::StringOutputStream output_stream(&output);
  Printer printer(&output_stream, '$');
  map< ::grpc::string, ::grpc::string> vars = {
      {"service_class", ServiceClassName(service)}};
  printer.Print(vars,
                "/**\n"
                " * Basic service implementation, over gRPC, that only does\n"
                " * marshalling and parsing.\n"
                " */\n");
  printer.Print(vars,
                "@interface $service_class$ :"
                " GRPCProtoService<$service_class$>\n");
  printer.Print(
      "- (instancetype)initWithHost:(NSString *)host"
      " NS_DESIGNATED_INITIALIZER;\n");
  printer.Print("+ (instancetype)serviceWithHost:(NSString *)host;\n");
  printer.Print("@end\n");
  return output;
 }
@ -258,26 +270,32 @@ void PrintMethodImplementations(Printer* printer,
        {"service_class", ServiceClassName(service)},
        {"package", service->file()->package()}};
-    printer.Print(vars, "@implementation $service_class$\n\n");
+    printer.Print(vars,
                  "@implementation $service_class$\n\n"
                  "// Designated initializer\n"
                  "- (instancetype)initWithHost:(NSString *)host {\n"
                  "  self = [super initWithHost:host\n"
                  "                 packageName:@\"$package$\"\n"
                  "                 serviceName:@\"$service_name$\"];\n"
                  "  return self;\n"
                  "}\n\n");
    printer.Print("// Designated initializer\n");
    printer.Print("- (instancetype)initWithHost:(NSString *)host {\n");
    printer.Print(
        vars,
        "  return (self = [super initWithHost:host"
        " packageName:@\"$package$\" serviceName:@\"$service_name$\"]);\n");
    printer.Print("}\n\n");
    printer.Print(
        "// Override superclass initializer to disallow different"
-        " package and service names.\n");
+        " package and service names.\n"
-    printer.Print("- (instancetype)initWithHost:(NSString *)host\n");
+        "- (instancetype)initWithHost:(NSString *)host\n"
-    printer.Print("                 packageName:(NSString *)packageName\n");
+        "                 packageName:(NSString *)packageName\n"
-    printer.Print("                 serviceName:(NSString *)serviceName {\n");
+        "                 serviceName:(NSString *)serviceName {\n"
-    printer.Print("  return [self initWithHost:host];\n");
+        "  return [self initWithHost:host];\n"
-    printer.Print("}\n\n");
+        "}\n\n");
-    printer.Print("+ (instancetype)serviceWithHost:(NSString *)host {\n");
+
-    printer.Print("  return [[self alloc] initWithHost:host];\n");
+    printer.Print(
-    printer.Print("}\n\n\n");
+        "#pragma mark - Class Methods\n\n"
        "+ (instancetype)serviceWithHost:(NSString *)host {\n"
        "  return [[self alloc] initWithHost:host];\n"
        "}\n\n");
    printer.Print("#pragma mark - Method Implementations\n\n");
    for (int i = 0; i < service->method_count(); i++) {
      PrintMethodImplementations(&printer, service->method(i));
--- a/src/compiler/objective_c_generator.h
+++ b/src/compiler/objective_c_generator.h
@ -31,9 +31,13 @@ using ::grpc::string;
 // Returns forward declaration of classes in the generated header file.
 string GetAllMessageClasses(const FileDescriptor* file);
-// Returns the content to be included in the "global_scope" insertion point of
+// Returns the content to be included defining the @protocol segment at the
-// the generated header file.
+// insertion point of the generated implementation file.
-string GetHeader(const ServiceDescriptor* service);
+string GetProtocol(const ServiceDescriptor* service);
 // Returns the content to be included defining the @interface segment at the
 // insertion point of the generated implementation file.
 string GetInterface(const ServiceDescriptor* service);
 // Returns the content to be included in the "global_scope" insertion point of
 // the generated implementation file.
--- a/src/compiler/objective_c_generator_helpers.h
+++ b/src/compiler/objective_c_generator_helpers.h
@ -40,5 +40,45 @@ inline string ServiceClassName(const ServiceDescriptor* service) {
  string prefix = file->options().objc_class_prefix();
  return prefix + service->name();
 }
 inline ::grpc::string LocalImport(const ::grpc::string& import) {
  return ::grpc::string("#import \"" + import + "\"\n");
 }
 inline ::grpc::string SystemImport(const ::grpc::string& import) {
  return ::grpc::string("#import <" + import + ">\n");
 }
 inline ::grpc::string PreprocConditional(::grpc::string symbol, bool invert) {
  return invert ? "!defined(" + symbol + ") || !" + symbol
                : "defined(" + symbol + ") && " + symbol;
 }
 inline ::grpc::string PreprocIf(const ::grpc::string& symbol,
                                const ::grpc::string& if_true) {
  return ::grpc::string("#if " + PreprocConditional(symbol, false) + "\n" +
                        if_true + "#endif\n");
 }
 inline ::grpc::string PreprocIfNot(const ::grpc::string& symbol,
                                   const ::grpc::string& if_true) {
  return ::grpc::string("#if " + PreprocConditional(symbol, true) + "\n" +
                        if_true + "#endif\n");
 }
 inline ::grpc::string PreprocIfElse(const ::grpc::string& symbol,
                                    const ::grpc::string& if_true,
                                    const ::grpc::string& if_false) {
  return ::grpc::string("#if " + PreprocConditional(symbol, false) + "\n" +
                        if_true + "#else\n" + if_false + "#endif\n");
 }
 inline ::grpc::string PreprocIfNotElse(const ::grpc::string& symbol,
                                       const ::grpc::string& if_true,
                                       const ::grpc::string& if_false) {
  return ::grpc::string("#if " + PreprocConditional(symbol, true) + "\n" +
                        if_true + "#else\n" + if_false + "#endif\n");
 }
 }  // namespace grpc_objective_c_generator
 #endif  // GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H
--- a/src/compiler/objective_c_plugin.cc
+++ b/src/compiler/objective_c_plugin.cc
@ -29,12 +29,42 @@
 using ::google::protobuf::compiler::objectivec::
    IsProtobufLibraryBundledProtoFile;
 using ::google::protobuf::compiler::objectivec::ProtobufLibraryFrameworkName;
 using ::grpc_objective_c_generator::LocalImport;
 using ::grpc_objective_c_generator::PreprocIfElse;
 using ::grpc_objective_c_generator::PreprocIfNot;
 using ::grpc_objective_c_generator::SystemImport;
 namespace {
 inline ::grpc::string ImportProtoHeaders(
    const grpc::protobuf::FileDescriptor* dep, const char* indent) {
  ::grpc::string header = grpc_objective_c_generator::MessageHeaderName(dep);
  if (!IsProtobufLibraryBundledProtoFile(dep)) {
    return indent + LocalImport(header);
  }
  ::grpc::string base_name = header;
  grpc_generator::StripPrefix(&base_name, "google/protobuf/");
  // create the import code snippet
  ::grpc::string framework_header =
      ::grpc::string(ProtobufLibraryFrameworkName) + "/" + base_name;
  static const ::grpc::string kFrameworkImportsCondition =
      "GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS";
  return PreprocIfElse(kFrameworkImportsCondition,
                       indent + SystemImport(framework_header),
                       indent + LocalImport(header));
 }
 }  // namespace
 class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
 public:
  ObjectiveCGrpcGenerator() {}
  virtual ~ObjectiveCGrpcGenerator() {}
 public:
  virtual bool Generate(const grpc::protobuf::FileDescriptor* file,
                        const ::grpc::string& parameter,
                        grpc::protobuf::compiler::GeneratorContext* context,
@ -44,97 +74,68 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
      return true;
    }
    static const ::grpc::string kNonNullBegin = "NS_ASSUME_NONNULL_BEGIN\n";
    static const ::grpc::string kNonNullEnd = "NS_ASSUME_NONNULL_END\n";
    static const ::grpc::string kProtocolOnly = "GPB_GRPC_PROTOCOL_ONLY";
    static const ::grpc::string kForwardDeclare =
        "GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO";
    ::grpc::string file_name =
        google::protobuf::compiler::objectivec::FilePath(file);
    ::grpc::string prefix = file->options().objc_class_prefix();
    {
      // Generate .pbrpc.h
-      ::grpc::string imports =
+      ::grpc::string imports = LocalImport(file_name + ".pbobjc.h");
-          ::grpc::string("#if !GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO\n") +
+
-          "#import \"" + file_name +
+      ::grpc::string system_imports = SystemImport("ProtoRPC/ProtoService.h") +
-          ".pbobjc.h\"\n"
+                                      SystemImport("ProtoRPC/ProtoRPC.h") +
-          "#endif\n\n"
+                                      SystemImport("RxLibrary/GRXWriteable.h") +
-          "#import <ProtoRPC/ProtoService.h>\n"
+                                      SystemImport("RxLibrary/GRXWriter.h");
-          "#import <ProtoRPC/ProtoRPC.h>\n"
+
-          "#import <RxLibrary/GRXWriteable.h>\n"
+      ::grpc::string forward_declarations = "@class GRPCProtoCall;\n\n";
-          "#import <RxLibrary/GRXWriter.h>\n";
+
-
+      ::grpc::string class_declarations =
-      ::grpc::string proto_imports;
+          grpc_objective_c_generator::GetAllMessageClasses(file);
-      proto_imports += "#if GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO\n" +
+
-                       grpc_objective_c_generator::GetAllMessageClasses(file) +
+      ::grpc::string class_imports;
                       "#else\n";
      for (int i = 0; i < file->dependency_count(); i++) {
-        ::grpc::string header =
+        class_imports += ImportProtoHeaders(file->dependency(i), "  ");
            grpc_objective_c_generator::MessageHeaderName(file->dependency(i));
        const grpc::protobuf::FileDescriptor* dependency = file->dependency(i);
        if (IsProtobufLibraryBundledProtoFile(dependency)) {
          ::grpc::string base_name = header;
          grpc_generator::StripPrefix(&base_name, "google/protobuf/");
          // create the import code snippet
          proto_imports +=
              "  #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\n"
              "    #import <" +
              ::grpc::string(ProtobufLibraryFrameworkName) + "/" + base_name +
              ">\n"
              "  #else\n"
              "    #import \"" +
              header +
              "\"\n"
              "  #endif\n";
        } else {
          proto_imports += ::grpc::string("  #import \"") + header + "\"\n";
        }
      }
      proto_imports += "#endif\n";
-      ::grpc::string declarations;
+      ::grpc::string protocols;
      for (int i = 0; i < file->service_count(); i++) {
        const grpc::protobuf::ServiceDescriptor* service = file->service(i);
-        declarations += grpc_objective_c_generator::GetHeader(service);
+        protocols += grpc_objective_c_generator::GetProtocol(service);
      }
-      static const ::grpc::string kNonNullBegin =
+      ::grpc::string interfaces;
-          "\nNS_ASSUME_NONNULL_BEGIN\n\n";
+      for (int i = 0; i < file->service_count(); i++) {
-      static const ::grpc::string kNonNullEnd = "\nNS_ASSUME_NONNULL_END\n";
+        const grpc::protobuf::ServiceDescriptor* service = file->service(i);
        interfaces += grpc_objective_c_generator::GetInterface(service);
      }
      Write(context, file_name + ".pbrpc.h",
-            imports + '\n' + proto_imports + '\n' + kNonNullBegin +
+            PreprocIfNot(kForwardDeclare, imports) + "\n" +
-                declarations + kNonNullEnd);
+                PreprocIfNot(kProtocolOnly, system_imports) + "\n" +
                PreprocIfElse(kForwardDeclare, class_declarations,
                              class_imports) +
                "\n" + forward_declarations + "\n" + kNonNullBegin + "\n" +
                protocols + "\n" + PreprocIfNot(kProtocolOnly, interfaces) +
                "\n" + kNonNullEnd + "\n");
    }
    {
      // Generate .pbrpc.m
-      ::grpc::string imports = ::grpc::string("#import \"") + file_name +
+      ::grpc::string imports = LocalImport(file_name + ".pbrpc.h") +
-                               ".pbrpc.h\"\n"
+                               LocalImport(file_name + ".pbobjc.h") +
-                               "#import \"" +
+                               SystemImport("ProtoRPC/ProtoRPC.h") +
-                               file_name +
+                               SystemImport("RxLibrary/GRXWriter+Immediate.h");
-                               ".pbobjc.h\"\n\n"
+
-                               "#import <ProtoRPC/ProtoRPC.h>\n"
+      ::grpc::string class_imports;
                               "#import <RxLibrary/GRXWriter+Immediate.h>\n";
      for (int i = 0; i < file->dependency_count(); i++) {
-        ::grpc::string header =
+        class_imports += ImportProtoHeaders(file->dependency(i), "");
            grpc_objective_c_generator::MessageHeaderName(file->dependency(i));
        const grpc::protobuf::FileDescriptor* dependency = file->dependency(i);
        if (IsProtobufLibraryBundledProtoFile(dependency)) {
          ::grpc::string base_name = header;
          grpc_generator::StripPrefix(&base_name, "google/protobuf/");
          // create the import code snippet
          imports +=
              "#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\n"
              "  #import <" +
              ::grpc::string(ProtobufLibraryFrameworkName) + "/" + base_name +
              ">\n"
              "#else\n"
              "  #import \"" +
              header +
              "\"\n"
              "#endif\n";
        } else {
          imports += ::grpc::string("#import \"") + header + "\"\n";
        }
      }
      ::grpc::string definitions;
@ -143,7 +144,9 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
        definitions += grpc_objective_c_generator::GetSource(service);
      }
-      Write(context, file_name + ".pbrpc.m", imports + '\n' + definitions);
+      Write(context, file_name + ".pbrpc.m",
            PreprocIfNot(kProtocolOnly,
                         imports + "\n" + class_imports + "\n" + definitions));
    }
    return true;
--- a/src/compiler/php_generator.cc
+++ b/src/compiler/php_generator.cc
@ -18,10 +18,12 @@
 #include <map>
 #include <google/protobuf/compiler/php/php_generator.h>
 #include "src/compiler/config.h"
 #include "src/compiler/generator_helpers.h"
 #include "src/compiler/php_generator_helpers.h"
 using google::protobuf::compiler::php::GeneratedClassName;
 using grpc::protobuf::Descriptor;
 using grpc::protobuf::FileDescriptor;
 using grpc::protobuf::MethodDescriptor;
@ -55,8 +57,10 @@ grpc::string MessageIdentifierName(const grpc::string& name,
                                   const FileDescriptor* file) {
  std::vector<grpc::string> tokens = grpc_generator::tokenize(name, ".");
  std::ostringstream oss;
-  oss << PackageName(file) << "\\"
+  if (PackageName(file) != "") {
-      << grpc_generator::CapitalizeFirstLetter(tokens[tokens.size() - 1]);
+    oss << PackageName(file) << "\\";
  }
  oss << grpc_generator::CapitalizeFirstLetter(tokens[tokens.size() - 1]);
  return oss.str();
 }
@ -67,9 +71,9 @@ void PrintMethod(const MethodDescriptor* method, Printer* out) {
  vars["service_name"] = method->service()->full_name();
  vars["name"] = method->name();
  vars["input_type_id"] =
-      MessageIdentifierName(input_type->full_name(), input_type->file());
+      MessageIdentifierName(GeneratedClassName(input_type), input_type->file());
-  vars["output_type_id"] =
+  vars["output_type_id"] = MessageIdentifierName(
-      MessageIdentifierName(output_type->full_name(), output_type->file());
+      GeneratedClassName(output_type), output_type->file());
  out->Print("/**\n");
  out->Print(GetPHPComments(method, " *").c_str());
--- a/src/core/ext/census/grpc_context.cc
+++ b/src/core/ext/census/grpc_context.cc
@ -16,6 +16,8 @@
 *
 */
 #include <grpc/support/port_platform.h>
 #include <grpc/census.h>
 #include <grpc/grpc.h>
 #include "src/core/lib/surface/api_trace.h"
--- a/src/core/ext/filters/client_channel/backup_poller.cc
+++ b/src/core/ext/filters/client_channel/backup_poller.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015 gRPC authors.
+ * Copyright 2017 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -16,6 +16,8 @@
 *
 */
 #include <grpc/support/port_platform.h>
 #include "src/core/ext/filters/client_channel/backup_poller.h"
 #include <grpc/grpc.h>
@ -125,13 +127,7 @@ static void run_poller(void* arg, grpc_error* error) {
                  &p->run_poller_closure);
 }
-void grpc_client_channel_start_backup_polling(
+static void g_poller_init_locked() {
    grpc_pollset_set* interested_parties) {
  gpr_once_init(&g_once, init_globals);
  if (g_poll_interval_ms == 0) {
    return;
  }
  gpr_mu_lock(&g_poller_mu);
  if (g_poller == nullptr) {
    g_poller = static_cast<backup_poller*>(gpr_zalloc(sizeof(backup_poller)));
    g_poller->pollset =
@ -147,7 +143,16 @@ void grpc_client_channel_start_backup_polling(
                    grpc_core::ExecCtx::Get()->Now() + g_poll_interval_ms,
                    &g_poller->run_poller_closure);
  }
 }
 void grpc_client_channel_start_backup_polling(
    grpc_pollset_set* interested_parties) {
  gpr_once_init(&g_once, init_globals);
  if (g_poll_interval_ms == 0) {
    return;
  }
  gpr_mu_lock(&g_poller_mu);
  g_poller_init_locked();
  gpr_ref(&g_poller->refs);
  /* Get a reference to g_poller->pollset before releasing g_poller_mu to make
   * TSAN happy. Otherwise, reading from g_poller (i.e g_poller->pollset) after
--- a/src/core/ext/filters/client_channel/backup_poller.h
+++ b/src/core/ext/filters/client_channel/backup_poller.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015 gRPC authors.
+ * Copyright 2017 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,6 +19,8 @@
 #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H
 #include <grpc/support/port_platform.h>
 #include <grpc/grpc.h>
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
--- a/src/core/ext/filters/client_channel/channel_connectivity.cc
+++ b/src/core/ext/filters/client_channel/channel_connectivity.cc
@ -16,6 +16,8 @@
 *
 */
 #include <grpc/support/port_platform.h>
 #include "src/core/lib/surface/channel.h"
 #include <inttypes.h>
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
--- a/src/core/ext/filters/client_channel/client_channel.h
+++ b/src/core/ext/filters/client_channel/client_channel.h
@ -19,6 +19,8 @@
 #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H
 #include <grpc/support/port_platform.h>
 #include "src/core/ext/filters/client_channel/client_channel_factory.h"
 #include "src/core/ext/filters/client_channel/resolver.h"
 #include "src/core/lib/channel/channel_stack.h"
--- a/src/core/ext/filters/client_channel/client_channel_factory.cc
+++ b/src/core/ext/filters/client_channel/client_channel_factory.cc
@ -16,6 +16,8 @@
 *
 */
 #include <grpc/support/port_platform.h>
 #include "src/core/ext/filters/client_channel/client_channel_factory.h"
 #include "src/core/lib/channel/channel_args.h"
--- a/src/core/ext/filters/client_channel/client_channel_factory.h
+++ b/src/core/ext/filters/client_channel/client_channel_factory.h
@ -19,6 +19,8 @@
 #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H
 #include <grpc/support/port_platform.h>
 #include <grpc/impl/codegen/grpc_types.h>
 #include "src/core/ext/filters/client_channel/subchannel.h"
--- a/src/core/ext/filters/client_channel/client_channel_plugin.cc
+++ b/src/core/ext/filters/client_channel/client_channel_plugin.cc
@ -63,7 +63,7 @@ static bool set_default_host_if_unset(grpc_channel_stack_builder* builder,
 }
 void grpc_client_channel_init(void) {
-  grpc_lb_policy_registry_init();
+  grpc_core::LoadBalancingPolicyRegistry::Builder::InitRegistry();
  grpc_core::ResolverRegistry::Builder::InitRegistry();
  grpc_retry_throttle_map_init();
  grpc_proxy_mapper_registry_init();
@ -83,5 +83,5 @@ void grpc_client_channel_shutdown(void) {
  grpc_proxy_mapper_registry_shutdown();
  grpc_retry_throttle_map_shutdown();
  grpc_core::ResolverRegistry::Builder::ShutdownRegistry();
-  grpc_lb_policy_registry_shutdown();
+  grpc_core::LoadBalancingPolicyRegistry::Builder::ShutdownRegistry();
 }
--- a/src/core/ext/filters/client_channel/connector.cc
+++ b/src/core/ext/filters/client_channel/connector.cc
@ -16,6 +16,8 @@
 *
 */
 #include <grpc/support/port_platform.h>
 #include "src/core/ext/filters/client_channel/connector.h"
 grpc_connector* grpc_connector_ref(grpc_connector* connector) {
--- a/Show More
+++ b/Show More