diff --git a/lib/netty b/lib/netty
index 44615f6cb2..ba9f214303 160000
--- a/lib/netty
+++ b/lib/netty
@@ -1 +1 @@
-Subproject commit 44615f6cb2d1ab3e7c2f7bac63ae1a76b290bc34
+Subproject commit ba9f2143030d1b781724f04adaac254af3326930
diff --git a/netty/src/main/java/io/grpc/transport/netty/NettyClientHandler.java b/netty/src/main/java/io/grpc/transport/netty/NettyClientHandler.java
index 034418240e..e7887dd49f 100644
--- a/netty/src/main/java/io/grpc/transport/netty/NettyClientHandler.java
+++ b/netty/src/main/java/io/grpc/transport/netty/NettyClientHandler.java
@@ -102,13 +102,13 @@ class NettyClientHandler extends Http2ConnectionHandler {
     initListener();
 
     // Disallow stream creation by the server.
-    connection.remote().maxStreams(0);
+    connection.remote().maxActiveStreams(0);
     connection.local().allowPushTo(false);
 
     // Observe the HTTP/2 connection for events.
     connection.addListener(new Http2ConnectionAdapter() {
       @Override
-      public void streamInactive(Http2Stream stream) {
+      public void onStreamClosed(Http2Stream stream) {
         // Whenever a stream has been closed, try to create a pending stream to fill its place.
         createPendingStreams();
       }
@@ -364,12 +364,12 @@ class NettyClientHandler extends Http2ConnectionHandler {
         return;
       }
 
-      if (connection.isGoAway()) {
+      if (connection.goAwaySent() || connection.goAwayReceived()) {
         failPendingStreams(goAwayStatus);
         return;
       }
 
-      if (!local.acceptingNewStreams()) {
+      if (!local.canCreateStream()) {
         // We're bumping up against the MAX_CONCURRENT_STEAMS threshold for this endpoint. Need to
         // wait until the endpoint is accepting new streams.
         return;
diff --git a/netty/src/main/java/io/grpc/transport/netty/NettyClientTransport.java b/netty/src/main/java/io/grpc/transport/netty/NettyClientTransport.java
index 7901e969a1..5af9a0abf4 100644
--- a/netty/src/main/java/io/grpc/transport/netty/NettyClientTransport.java
+++ b/netty/src/main/java/io/grpc/transport/netty/NettyClientTransport.java
@@ -63,8 +63,8 @@ import io.netty.handler.codec.http2.Http2Headers;
 import io.netty.handler.codec.http2.Http2InboundFrameLogger;
 import io.netty.handler.codec.http2.Http2OutboundFrameLogger;
 import io.netty.handler.codec.http2.Http2StreamRemovalPolicy;
+import io.netty.handler.logging.LogLevel;
 import io.netty.handler.ssl.SslContext;
-import io.netty.util.internal.logging.InternalLogLevel;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -334,7 +334,7 @@ class NettyClientTransport implements ClientTransport {
       Http2FrameReader frameReader = new DefaultHttp2FrameReader();
       Http2FrameWriter frameWriter = new DefaultHttp2FrameWriter();
 
-      Http2FrameLogger frameLogger = new Http2FrameLogger(InternalLogLevel.DEBUG);
+      Http2FrameLogger frameLogger = new Http2FrameLogger(LogLevel.DEBUG);
       frameReader = new Http2InboundFrameLogger(frameReader, frameLogger);
       frameWriter = new Http2OutboundFrameLogger(frameWriter, frameLogger);
 
diff --git a/netty/src/main/java/io/grpc/transport/netty/NettyServerTransport.java b/netty/src/main/java/io/grpc/transport/netty/NettyServerTransport.java
index 868f08da5d..50c9069226 100644
--- a/netty/src/main/java/io/grpc/transport/netty/NettyServerTransport.java
+++ b/netty/src/main/java/io/grpc/transport/netty/NettyServerTransport.java
@@ -51,8 +51,8 @@ import io.netty.handler.codec.http2.Http2FrameWriter;
 import io.netty.handler.codec.http2.Http2InboundFrameLogger;
 import io.netty.handler.codec.http2.Http2OutboundFrameLogger;
 import io.netty.handler.codec.http2.Http2StreamRemovalPolicy;
+import io.netty.handler.logging.LogLevel;
 import io.netty.handler.ssl.SslContext;
-import io.netty.util.internal.logging.InternalLogLevel;
 
 import javax.annotation.Nullable;
 
@@ -60,7 +60,7 @@ import javax.annotation.Nullable;
  * The Netty-based server transport.
  */
 class NettyServerTransport extends AbstractService {
-  private static final Http2FrameLogger frameLogger = new Http2FrameLogger(InternalLogLevel.DEBUG); 
+  private static final Http2FrameLogger frameLogger = new Http2FrameLogger(LogLevel.DEBUG); 
   private final Channel channel;
   private final ServerListener serverListener;
   private final SslContext sslContext;
diff --git a/netty/src/test/java/io/grpc/transport/netty/NettyClientHandlerTest.java b/netty/src/test/java/io/grpc/transport/netty/NettyClientHandlerTest.java
index 2f228efe9f..df7169159e 100644
--- a/netty/src/test/java/io/grpc/transport/netty/NettyClientHandlerTest.java
+++ b/netty/src/test/java/io/grpc/transport/netty/NettyClientHandlerTest.java
@@ -177,7 +177,7 @@ public class NettyClientHandlerTest extends NettyHandlerTestBase {
 
   @Test
   public void cancelBeforeStreamAssignedShouldSucceed() throws Exception {
-    handler.connection().local().maxStreams(0);
+    handler.connection().local().maxActiveStreams(0);
     handler.write(ctx, new CreateStreamCommand(grpcHeaders, stream), promise);
     mockContext();
     verify(stream, never()).id(any(Integer.class));