diff --git a/alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java b/alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java
index b11cae587b..67c3859b6a 100644
--- a/alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java
+++ b/alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java
@@ -384,7 +384,7 @@ public class AltsProtocolNegotiatorTest {
 
   private CapturingGrpcHttp2ConnectionHandler capturingGrpcHandler() {
     // Netty Boilerplate.  We don't really need any of this, but there is a tight coupling
-    // between a Http2ConnectionHandler and its dependencies.
+    // between an Http2ConnectionHandler and its dependencies.
     Http2Connection connection = new DefaultHttp2Connection(true);
     Http2FrameWriter frameWriter = new DefaultHttp2FrameWriter();
     Http2FrameReader frameReader = new DefaultHttp2FrameReader(false);
diff --git a/netty/src/main/java/io/grpc/netty/GrpcSslContexts.java b/netty/src/main/java/io/grpc/netty/GrpcSslContexts.java
index 1ed7430475..abf35236f0 100644
--- a/netty/src/main/java/io/grpc/netty/GrpcSslContexts.java
+++ b/netty/src/main/java/io/grpc/netty/GrpcSslContexts.java
@@ -111,7 +111,7 @@ public class GrpcSslContexts {
   }
 
   /**
-   * Creates a SslContextBuilder with ciphers and APN appropriate for gRPC.
+   * Creates an SslContextBuilder with ciphers and APN appropriate for gRPC.
    *
    * @see SslContextBuilder#forClient()
    * @see #configure(SslContextBuilder)
@@ -121,7 +121,7 @@ public class GrpcSslContexts {
   }
 
   /**
-   * Creates a SslContextBuilder with ciphers and APN appropriate for gRPC.
+   * Creates an SslContextBuilder with ciphers and APN appropriate for gRPC.
    *
    * @see SslContextBuilder#forServer(File, File)
    * @see #configure(SslContextBuilder)
@@ -131,7 +131,7 @@ public class GrpcSslContexts {
   }
 
   /**
-   * Creates a SslContextBuilder with ciphers and APN appropriate for gRPC.
+   * Creates an SslContextBuilder with ciphers and APN appropriate for gRPC.
    *
    * @see SslContextBuilder#forServer(File, File, String)
    * @see #configure(SslContextBuilder)
@@ -142,7 +142,7 @@ public class GrpcSslContexts {
   }
 
   /**
-   * Creates a SslContextBuilder with ciphers and APN appropriate for gRPC.
+   * Creates an SslContextBuilder with ciphers and APN appropriate for gRPC.
    *
    * @see SslContextBuilder#forServer(InputStream, InputStream)
    * @see #configure(SslContextBuilder)
@@ -152,7 +152,7 @@ public class GrpcSslContexts {
   }
 
   /**
-   * Creates a SslContextBuilder with ciphers and APN appropriate for gRPC.
+   * Creates an SslContextBuilder with ciphers and APN appropriate for gRPC.
    *
    * @see SslContextBuilder#forServer(InputStream, InputStream, String)
    * @see #configure(SslContextBuilder)
diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
index 2e3490554e..698d4afeb9 100644
--- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
+++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
@@ -1099,7 +1099,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
     }
 
     /**
-     * Handle a HTTP2 DATA frame.
+     * Handle an HTTP2 DATA frame.
      */
     @Override
     public void data(boolean inFinished, int streamId, BufferedSource in, int length)
diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java
index e43713d662..937758a538 100644
--- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java
+++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java
@@ -46,7 +46,7 @@ final class OkHttpTlsUpgrader {
       Collections.unmodifiableList(Arrays.asList(Protocol.GRPC_EXP, Protocol.HTTP_2));
 
   /**
-   * Upgrades given Socket to be a SSLSocket.
+   * Upgrades given Socket to be an SSLSocket.
    *
    * @throws IOException if an IO error was encountered during the upgrade handshake.
    * @throws RuntimeException if the upgrade negotiation failed.