diff --git a/CMakeLists.txt b/CMakeLists.txt
index b22aa1899e8..ee4d2bcbaba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -968,6 +968,8 @@ add_library(grpc
   src/core/lib/compression/compression.c
   src/core/lib/compression/message_compress.c
   src/core/lib/compression/stream_compression.c
+  src/core/lib/compression/stream_compression_gzip.c
+  src/core/lib/compression/stream_compression_identity.c
   src/core/lib/debug/stats.c
   src/core/lib/debug/stats_data.c
   src/core/lib/http/format_request.c
@@ -1319,6 +1321,8 @@ add_library(grpc_cronet
   src/core/lib/compression/compression.c
   src/core/lib/compression/message_compress.c
   src/core/lib/compression/stream_compression.c
+  src/core/lib/compression/stream_compression_gzip.c
+  src/core/lib/compression/stream_compression_identity.c
   src/core/lib/debug/stats.c
   src/core/lib/debug/stats_data.c
   src/core/lib/http/format_request.c
@@ -1638,6 +1642,8 @@ add_library(grpc_test_util
   src/core/lib/compression/compression.c
   src/core/lib/compression/message_compress.c
   src/core/lib/compression/stream_compression.c
+  src/core/lib/compression/stream_compression_gzip.c
+  src/core/lib/compression/stream_compression_identity.c
   src/core/lib/debug/stats.c
   src/core/lib/debug/stats_data.c
   src/core/lib/http/format_request.c
@@ -1901,6 +1907,8 @@ add_library(grpc_test_util_unsecure
   src/core/lib/compression/compression.c
   src/core/lib/compression/message_compress.c
   src/core/lib/compression/stream_compression.c
+  src/core/lib/compression/stream_compression_gzip.c
+  src/core/lib/compression/stream_compression_identity.c
   src/core/lib/debug/stats.c
   src/core/lib/debug/stats_data.c
   src/core/lib/http/format_request.c
@@ -2150,6 +2158,8 @@ add_library(grpc_unsecure
   src/core/lib/compression/compression.c
   src/core/lib/compression/message_compress.c
   src/core/lib/compression/stream_compression.c
+  src/core/lib/compression/stream_compression_gzip.c
+  src/core/lib/compression/stream_compression_identity.c
   src/core/lib/debug/stats.c
   src/core/lib/debug/stats_data.c
   src/core/lib/http/format_request.c
@@ -2851,6 +2861,8 @@ add_library(grpc++_cronet
   src/core/lib/compression/compression.c
   src/core/lib/compression/message_compress.c
   src/core/lib/compression/stream_compression.c
+  src/core/lib/compression/stream_compression_gzip.c
+  src/core/lib/compression/stream_compression_identity.c
   src/core/lib/debug/stats.c
   src/core/lib/debug/stats_data.c
   src/core/lib/http/format_request.c
diff --git a/Makefile b/Makefile
index 743ca41dc6c..a3db8106dae 100644
--- a/Makefile
+++ b/Makefile
@@ -2915,6 +2915,8 @@ LIBGRPC_SRC = \
     src/core/lib/compression/compression.c \
     src/core/lib/compression/message_compress.c \
     src/core/lib/compression/stream_compression.c \
+    src/core/lib/compression/stream_compression_gzip.c \
+    src/core/lib/compression/stream_compression_identity.c \
     src/core/lib/debug/stats.c \
     src/core/lib/debug/stats_data.c \
     src/core/lib/http/format_request.c \
@@ -3264,6 +3266,8 @@ LIBGRPC_CRONET_SRC = \
     src/core/lib/compression/compression.c \
     src/core/lib/compression/message_compress.c \
     src/core/lib/compression/stream_compression.c \
+    src/core/lib/compression/stream_compression_gzip.c \
+    src/core/lib/compression/stream_compression_identity.c \
     src/core/lib/debug/stats.c \
     src/core/lib/debug/stats_data.c \
     src/core/lib/http/format_request.c \
@@ -3580,6 +3584,8 @@ LIBGRPC_TEST_UTIL_SRC = \
     src/core/lib/compression/compression.c \
     src/core/lib/compression/message_compress.c \
     src/core/lib/compression/stream_compression.c \
+    src/core/lib/compression/stream_compression_gzip.c \
+    src/core/lib/compression/stream_compression_identity.c \
     src/core/lib/debug/stats.c \
     src/core/lib/debug/stats_data.c \
     src/core/lib/http/format_request.c \
@@ -3832,6 +3838,8 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
     src/core/lib/compression/compression.c \
     src/core/lib/compression/message_compress.c \
     src/core/lib/compression/stream_compression.c \
+    src/core/lib/compression/stream_compression_gzip.c \
+    src/core/lib/compression/stream_compression_identity.c \
     src/core/lib/debug/stats.c \
     src/core/lib/debug/stats_data.c \
     src/core/lib/http/format_request.c \
@@ -4057,6 +4065,8 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/compression/compression.c \
     src/core/lib/compression/message_compress.c \
     src/core/lib/compression/stream_compression.c \
+    src/core/lib/compression/stream_compression_gzip.c \
+    src/core/lib/compression/stream_compression_identity.c \
     src/core/lib/debug/stats.c \
     src/core/lib/debug/stats_data.c \
     src/core/lib/http/format_request.c \
@@ -4741,6 +4751,8 @@ LIBGRPC++_CRONET_SRC = \
     src/core/lib/compression/compression.c \
     src/core/lib/compression/message_compress.c \
     src/core/lib/compression/stream_compression.c \
+    src/core/lib/compression/stream_compression_gzip.c \
+    src/core/lib/compression/stream_compression_identity.c \
     src/core/lib/debug/stats.c \
     src/core/lib/debug/stats_data.c \
     src/core/lib/http/format_request.c \
diff --git a/binding.gyp b/binding.gyp
index 946edd8139c..0547a82512f 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -667,6 +667,8 @@
         'src/core/lib/compression/compression.c',
         'src/core/lib/compression/message_compress.c',
         'src/core/lib/compression/stream_compression.c',
+        'src/core/lib/compression/stream_compression_gzip.c',
+        'src/core/lib/compression/stream_compression_identity.c',
         'src/core/lib/debug/stats.c',
         'src/core/lib/debug/stats_data.c',
         'src/core/lib/http/format_request.c',
diff --git a/build.yaml b/build.yaml
index 0939796bcb3..0de5b9859d8 100644
--- a/build.yaml
+++ b/build.yaml
@@ -195,9 +195,10 @@ filegroups:
   - src/core/lib/compression/compression.c
   - src/core/lib/compression/message_compress.c
   - src/core/lib/compression/stream_compression.c
+  - src/core/lib/compression/stream_compression_gzip.c
+  - src/core/lib/compression/stream_compression_identity.c
   - src/core/lib/debug/stats.c
   - src/core/lib/debug/stats_data.c
-  - src/core/lib/compression/stream_compression_gzip.c
   - src/core/lib/http/format_request.c
   - src/core/lib/http/httpcli.c
   - src/core/lib/http/parser.c
@@ -348,9 +349,10 @@ filegroups:
   - src/core/lib/compression/algorithm_metadata.h
   - src/core/lib/compression/message_compress.h
   - src/core/lib/compression/stream_compression.h
+  - src/core/lib/compression/stream_compression_gzip.h
+  - src/core/lib/compression/stream_compression_identity.h
   - src/core/lib/debug/stats.h
   - src/core/lib/debug/stats_data.h
-  - src/core/lib/compression/stream_compression_gzip.h
   - src/core/lib/http/format_request.h
   - src/core/lib/http/httpcli.h
   - src/core/lib/http/parser.h
diff --git a/config.m4 b/config.m4
index d9d25cb0065..fbae82de7f6 100644
--- a/config.m4
+++ b/config.m4
@@ -96,6 +96,8 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/compression/compression.c \
     src/core/lib/compression/message_compress.c \
     src/core/lib/compression/stream_compression.c \
+    src/core/lib/compression/stream_compression_gzip.c \
+    src/core/lib/compression/stream_compression_identity.c \
     src/core/lib/debug/stats.c \
     src/core/lib/debug/stats_data.c \
     src/core/lib/http/format_request.c \
diff --git a/config.w32 b/config.w32
index 640115e8614..3dacc31e6ad 100644
--- a/config.w32
+++ b/config.w32
@@ -73,6 +73,8 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\compression\\compression.c " +
     "src\\core\\lib\\compression\\message_compress.c " +
     "src\\core\\lib\\compression\\stream_compression.c " +
+    "src\\core\\lib\\compression\\stream_compression_gzip.c " +
+    "src\\core\\lib\\compression\\stream_compression_identity.c " +
     "src\\core\\lib\\debug\\stats.c " +
     "src\\core\\lib\\debug\\stats_data.c " +
     "src\\core\\lib\\http\\format_request.c " +
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 66368b1b4b6..8fea17c5dba 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -329,6 +329,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/compression/algorithm_metadata.h',
                       'src/core/lib/compression/message_compress.h',
                       'src/core/lib/compression/stream_compression.h',
+                      'src/core/lib/compression/stream_compression_gzip.h',
+                      'src/core/lib/compression/stream_compression_identity.h',
                       'src/core/lib/debug/stats.h',
                       'src/core/lib/debug/stats_data.h',
                       'src/core/lib/http/format_request.h',
@@ -479,6 +481,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/compression/compression.c',
                       'src/core/lib/compression/message_compress.c',
                       'src/core/lib/compression/stream_compression.c',
+                      'src/core/lib/compression/stream_compression_gzip.c',
+                      'src/core/lib/compression/stream_compression_identity.c',
                       'src/core/lib/debug/stats.c',
                       'src/core/lib/debug/stats_data.c',
                       'src/core/lib/http/format_request.c',
@@ -826,6 +830,8 @@ Pod::Spec.new do |s|
                               'src/core/lib/compression/algorithm_metadata.h',
                               'src/core/lib/compression/message_compress.h',
                               'src/core/lib/compression/stream_compression.h',
+                              'src/core/lib/compression/stream_compression_gzip.h',
+                              'src/core/lib/compression/stream_compression_identity.h',
                               'src/core/lib/debug/stats.h',
                               'src/core/lib/debug/stats_data.h',
                               'src/core/lib/http/format_request.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index d3779a9991e..166c914c529 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -261,6 +261,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/compression/algorithm_metadata.h )
   s.files += %w( src/core/lib/compression/message_compress.h )
   s.files += %w( src/core/lib/compression/stream_compression.h )
+  s.files += %w( src/core/lib/compression/stream_compression_gzip.h )
+  s.files += %w( src/core/lib/compression/stream_compression_identity.h )
   s.files += %w( src/core/lib/debug/stats.h )
   s.files += %w( src/core/lib/debug/stats_data.h )
   s.files += %w( src/core/lib/http/format_request.h )
@@ -415,6 +417,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/compression/compression.c )
   s.files += %w( src/core/lib/compression/message_compress.c )
   s.files += %w( src/core/lib/compression/stream_compression.c )
+  s.files += %w( src/core/lib/compression/stream_compression_gzip.c )
+  s.files += %w( src/core/lib/compression/stream_compression_identity.c )
   s.files += %w( src/core/lib/debug/stats.c )
   s.files += %w( src/core/lib/debug/stats_data.c )
   s.files += %w( src/core/lib/http/format_request.c )
diff --git a/grpc.gyp b/grpc.gyp
index 40938a4564a..2e2e0b7dfda 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -233,6 +233,8 @@
         'src/core/lib/compression/compression.c',
         'src/core/lib/compression/message_compress.c',
         'src/core/lib/compression/stream_compression.c',
+        'src/core/lib/compression/stream_compression_gzip.c',
+        'src/core/lib/compression/stream_compression_identity.c',
         'src/core/lib/debug/stats.c',
         'src/core/lib/debug/stats_data.c',
         'src/core/lib/http/format_request.c',
@@ -533,6 +535,8 @@
         'src/core/lib/compression/compression.c',
         'src/core/lib/compression/message_compress.c',
         'src/core/lib/compression/stream_compression.c',
+        'src/core/lib/compression/stream_compression_gzip.c',
+        'src/core/lib/compression/stream_compression_identity.c',
         'src/core/lib/debug/stats.c',
         'src/core/lib/debug/stats_data.c',
         'src/core/lib/http/format_request.c',
@@ -738,6 +742,8 @@
         'src/core/lib/compression/compression.c',
         'src/core/lib/compression/message_compress.c',
         'src/core/lib/compression/stream_compression.c',
+        'src/core/lib/compression/stream_compression_gzip.c',
+        'src/core/lib/compression/stream_compression_identity.c',
         'src/core/lib/debug/stats.c',
         'src/core/lib/debug/stats_data.c',
         'src/core/lib/http/format_request.c',
@@ -928,6 +934,8 @@
         'src/core/lib/compression/compression.c',
         'src/core/lib/compression/message_compress.c',
         'src/core/lib/compression/stream_compression.c',
+        'src/core/lib/compression/stream_compression_gzip.c',
+        'src/core/lib/compression/stream_compression_identity.c',
         'src/core/lib/debug/stats.c',
         'src/core/lib/debug/stats_data.c',
         'src/core/lib/http/format_request.c',
diff --git a/package.xml b/package.xml
index 1cca4fbdddb..33b8378a35d 100644
--- a/package.xml
+++ b/package.xml
@@ -271,6 +271,8 @@
     <file baseinstalldir="/" name="src/core/lib/compression/algorithm_metadata.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/message_compress.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/stream_compression.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/compression/stream_compression_gzip.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/compression/stream_compression_identity.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/debug/stats.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/debug/stats_data.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/http/format_request.h" role="src" />
@@ -425,6 +427,8 @@
     <file baseinstalldir="/" name="src/core/lib/compression/compression.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/message_compress.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/compression/stream_compression.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/compression/stream_compression_gzip.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/compression/stream_compression_identity.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/debug/stats.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/debug/stats_data.c" role="src" />
     <file baseinstalldir="/" name="src/core/lib/http/format_request.c" role="src" />
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 1cbf345ab6e..9025a07ba9c 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -72,6 +72,8 @@ CORE_SOURCE_FILES = [
   'src/core/lib/compression/compression.c',
   'src/core/lib/compression/message_compress.c',
   'src/core/lib/compression/stream_compression.c',
+  'src/core/lib/compression/stream_compression_gzip.c',
+  'src/core/lib/compression/stream_compression_identity.c',
   'src/core/lib/debug/stats.c',
   'src/core/lib/debug/stats_data.c',
   'src/core/lib/http/format_request.c',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 91c149eec92..71f500b53ff 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -942,6 +942,8 @@ src/core/lib/channel/handshaker_registry.h \
 src/core/lib/compression/algorithm_metadata.h \
 src/core/lib/compression/message_compress.h \
 src/core/lib/compression/stream_compression.h \
+src/core/lib/compression/stream_compression_gzip.h \
+src/core/lib/compression/stream_compression_identity.h \
 src/core/lib/debug/stats.h \
 src/core/lib/debug/stats_data.h \
 src/core/lib/debug/trace.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 26d982acd7d..63993c808bc 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1077,6 +1077,10 @@ src/core/lib/compression/message_compress.c \
 src/core/lib/compression/message_compress.h \
 src/core/lib/compression/stream_compression.c \
 src/core/lib/compression/stream_compression.h \
+src/core/lib/compression/stream_compression_gzip.c \
+src/core/lib/compression/stream_compression_gzip.h \
+src/core/lib/compression/stream_compression_identity.c \
+src/core/lib/compression/stream_compression_identity.h \
 src/core/lib/debug/stats.c \
 src/core/lib/debug/stats.h \
 src/core/lib/debug/stats_data.c \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index fbd47389f71..cca4cff0fb1 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -7856,6 +7856,8 @@
       "src/core/lib/compression/compression.c", 
       "src/core/lib/compression/message_compress.c", 
       "src/core/lib/compression/stream_compression.c", 
+      "src/core/lib/compression/stream_compression_gzip.c", 
+      "src/core/lib/compression/stream_compression_identity.c", 
       "src/core/lib/debug/stats.c", 
       "src/core/lib/debug/stats_data.c", 
       "src/core/lib/http/format_request.c", 
@@ -8009,6 +8011,8 @@
       "src/core/lib/compression/algorithm_metadata.h", 
       "src/core/lib/compression/message_compress.h", 
       "src/core/lib/compression/stream_compression.h", 
+      "src/core/lib/compression/stream_compression_gzip.h", 
+      "src/core/lib/compression/stream_compression_identity.h", 
       "src/core/lib/debug/stats.h", 
       "src/core/lib/debug/stats_data.h", 
       "src/core/lib/http/format_request.h", 
@@ -8141,6 +8145,8 @@
       "src/core/lib/compression/algorithm_metadata.h", 
       "src/core/lib/compression/message_compress.h", 
       "src/core/lib/compression/stream_compression.h", 
+      "src/core/lib/compression/stream_compression_gzip.h", 
+      "src/core/lib/compression/stream_compression_identity.h", 
       "src/core/lib/debug/stats.h", 
       "src/core/lib/debug/stats_data.h", 
       "src/core/lib/http/format_request.h",