diff --git a/grpclb/build.gradle b/grpclb/build.gradle
index 0eecbcd812..cea599828f 100644
--- a/grpclb/build.gradle
+++ b/grpclb/build.gradle
@@ -35,6 +35,7 @@ configureProtoCompilation()
 
 tasks.named("javadoc").configure {
     exclude 'io/grpc/grpclb/Internal*'
+    exclude 'io/grpc/grpclb/*Provider.java'
 }
 
 tasks.named("jacocoTestReport").configure {
diff --git a/netty/build.gradle b/netty/build.gradle
index fff10d484d..3150e8069b 100644
--- a/netty/build.gradle
+++ b/netty/build.gradle
@@ -81,7 +81,10 @@ import net.ltgt.gradle.errorprone.CheckSeverity
 
 tasks.named("javadoc").configure {
     options.links 'http://netty.io/4.1/api/'
+    exclude 'io/grpc/netty/*Provider.java'
+    exclude 'io/grpc/netty/GrpcHttp2ConnectionHandler.java'
     exclude 'io/grpc/netty/Internal*'
+    exclude 'io/grpc/netty/ProtocolNegotiationEvent.java'
 }
 
 tasks.named("test").configure {
diff --git a/rls/build.gradle b/rls/build.gradle
index 19e5027664..b0abb08b4f 100644
--- a/rls/build.gradle
+++ b/rls/build.gradle
@@ -45,6 +45,7 @@ tasks.named("javadoc").configure {
     // Do not publish javadoc since currently there is no public API.
     failOnError false  // no public or protected classes found to document
     exclude 'io/grpc/lookup/v1/**'
+    exclude 'io/grpc/rls/*Provider.java'
     exclude 'io/grpc/rls/internal/**'
     exclude 'io/grpc/rls/Internal*'
 }
diff --git a/services/build.gradle b/services/build.gradle
index f2a0ef62d3..3135d9095e 100644
--- a/services/build.gradle
+++ b/services/build.gradle
@@ -45,6 +45,7 @@ configureProtoCompilation()
 tasks.named("javadoc").configure {
     exclude 'io/grpc/services/Internal*.java'
     exclude 'io/grpc/services/internal/*'
+    exclude 'io/grpc/protobuf/services/BinaryLogProvider.java'
     exclude 'io/grpc/protobuf/services/internal/*'
 }
 
diff --git a/util/build.gradle b/util/build.gradle
index 6234bdc8f8..a05c55b27b 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -40,4 +40,6 @@ animalsniffer {
 
 tasks.named("javadoc").configure {
     exclude 'io/grpc/util/MultiChildLoadBalancer.java'
+    exclude 'io/grpc/util/OutlierDetectionLoadBalancer*'
+    exclude 'io/grpc/util/RoundRobinLoadBalancer*'
 }
diff --git a/xds/build.gradle b/xds/build.gradle
index 3e2b453103..3f3cf6a0f6 100644
--- a/xds/build.gradle
+++ b/xds/build.gradle
@@ -162,6 +162,7 @@ tasks.named("javadoc").configure {
     exclude 'io/grpc/xds/FilterChainMatchingProtocolNegotiators.java'
     exclude 'io/grpc/xds/TlsContextManager.java'
     exclude 'io/grpc/xds/XdsAttributes.java'
+    exclude 'io/grpc/xds/XdsCredentialsProvider.java'
     exclude 'io/grpc/xds/XdsInitializationException.java'
     exclude 'io/grpc/xds/XdsNameResolverProvider.java'
     exclude 'io/grpc/xds/internal/**'