diff --git a/all/build.gradle b/all/build.gradle
index f955e2643b..e67b6b4705 100644
--- a/all/build.gradle
+++ b/all/build.gradle
@@ -55,6 +55,7 @@ javadoc {
         source subproject.javadoc.source
         options.links subproject.javadoc.options.links.toArray(new String[0])
     }
+    exclude 'io/grpc/internal/**'
 }
 
 task jacocoMerge(type: JacocoMerge) {
diff --git a/core/build.gradle b/core/build.gradle
index 30bf3852bd..c189b27f0b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -13,3 +13,5 @@ dependencies {
 animalsniffer {
     signature = "org.codehaus.mojo.signature:java16:+@signature"
 }
+
+javadoc.exclude 'io/grpc/internal/**'
diff --git a/core/src/main/java/io/grpc/AbstractChannelBuilder.java b/core/src/main/java/io/grpc/AbstractChannelBuilder.java
index ad9e5079a0..78ced480bb 100644
--- a/core/src/main/java/io/grpc/AbstractChannelBuilder.java
+++ b/core/src/main/java/io/grpc/AbstractChannelBuilder.java
@@ -35,7 +35,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import io.grpc.internal.ClientTransportFactory;
-import io.grpc.internal.Internal;
 import io.grpc.internal.SharedResourceHolder;
 import io.grpc.internal.SharedResourceHolder.Resource;
 
diff --git a/core/src/main/java/io/grpc/ChannelImpl.java b/core/src/main/java/io/grpc/ChannelImpl.java
index 8f9f153f73..c5023aa623 100644
--- a/core/src/main/java/io/grpc/ChannelImpl.java
+++ b/core/src/main/java/io/grpc/ChannelImpl.java
@@ -42,7 +42,6 @@ import io.grpc.internal.ClientStreamListener;
 import io.grpc.internal.ClientTransport;
 import io.grpc.internal.ClientTransport.PingCallback;
 import io.grpc.internal.ClientTransportFactory;
-import io.grpc.internal.ExperimentalApi;
 import io.grpc.internal.HttpUtil;
 import io.grpc.internal.SerializingExecutor;
 import io.grpc.internal.SharedResourceHolder;
diff --git a/core/src/main/java/io/grpc/Context.java b/core/src/main/java/io/grpc/Context.java
index d7fe619572..e23c085522 100644
--- a/core/src/main/java/io/grpc/Context.java
+++ b/core/src/main/java/io/grpc/Context.java
@@ -35,7 +35,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
-import io.grpc.internal.ExperimentalApi;
 import io.grpc.internal.SharedResourceHolder;
 
 import java.io.Closeable;
diff --git a/core/src/main/java/io/grpc/internal/ExperimentalApi.java b/core/src/main/java/io/grpc/ExperimentalApi.java
similarity index 98%
rename from core/src/main/java/io/grpc/internal/ExperimentalApi.java
rename to core/src/main/java/io/grpc/ExperimentalApi.java
index 22578388ac..eddd208135 100644
--- a/core/src/main/java/io/grpc/internal/ExperimentalApi.java
+++ b/core/src/main/java/io/grpc/ExperimentalApi.java
@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.internal;
+package io.grpc;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -49,6 +49,7 @@ import java.lang.annotation.Target;
  * <li>Removing this annotation from an API gives it stable status.</li>
  * </ol>
  */
+@Internal
 @Retention(RetentionPolicy.SOURCE)
 @Target({
     ElementType.ANNOTATION_TYPE,
diff --git a/core/src/main/java/io/grpc/internal/Internal.java b/core/src/main/java/io/grpc/Internal.java
similarity index 98%
rename from core/src/main/java/io/grpc/internal/Internal.java
rename to core/src/main/java/io/grpc/Internal.java
index 8081c26aef..3f6302a46b 100644
--- a/core/src/main/java/io/grpc/internal/Internal.java
+++ b/core/src/main/java/io/grpc/Internal.java
@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.internal;
+package io.grpc;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -41,6 +41,7 @@ import java.lang.annotation.Target;
  * Annotates a program element which is internal to gRPC, not part of the public API, and should not
  * be used outside of gRPC codebase.
  */
+@Internal
 @Retention(RetentionPolicy.SOURCE)
 @Target({
     ElementType.ANNOTATION_TYPE,
diff --git a/core/src/main/java/io/grpc/internal/package-info.java b/core/src/main/java/io/grpc/internal/package-info.java
index 1d2f8a1a2f..883e56b0c9 100644
--- a/core/src/main/java/io/grpc/internal/package-info.java
+++ b/core/src/main/java/io/grpc/internal/package-info.java
@@ -34,5 +34,5 @@
  *
  * <p>All interfaces under this package are not public API, and should not be used outside of gRPC.
  */
-@Internal
+@io.grpc.Internal
 package io.grpc.internal;
diff --git a/netty/src/main/java/io/grpc/netty/GrpcSslContexts.java b/netty/src/main/java/io/grpc/netty/GrpcSslContexts.java
index 597cb3740d..82f750be99 100644
--- a/netty/src/main/java/io/grpc/netty/GrpcSslContexts.java
+++ b/netty/src/main/java/io/grpc/netty/GrpcSslContexts.java
@@ -31,7 +31,7 @@
 
 package io.grpc.netty;
 
-import io.grpc.internal.ExperimentalApi;
+import io.grpc.ExperimentalApi;
 import io.netty.handler.codec.http2.Http2SecurityUtil;
 import io.netty.handler.ssl.ApplicationProtocolConfig;
 import io.netty.handler.ssl.ApplicationProtocolConfig.Protocol;