diff --git a/StubLibraries.bp b/StubLibraries.bp
index 50524998d4162..83b0eb2b59720 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -254,7 +254,6 @@ droidstubs {
 java_defaults {
     name: "android_defaults_stubs_current",
     libs: [ "stub-annotations" ],
-    static_libs: [ "private-stub-annotations-jar" ],
     errorprone: {
         javacflags: [
             "-XepDisableAllChecks",
@@ -270,18 +269,21 @@ java_defaults {
 java_library_static {
     name: "android_stubs_current",
     srcs: [ ":api-stubs-docs" ],
+    static_libs: [ "private-stub-annotations-jar" ],
     defaults: ["android_defaults_stubs_current"],
 }
 
 java_library_static {
     name: "android_system_stubs_current",
     srcs: [ ":system-api-stubs-docs" ],
+    static_libs: [ "private-stub-annotations-jar" ],
     defaults: ["android_defaults_stubs_current"],
 }
 
 java_library_static {
     name: "android_test_stubs_current",
     srcs: [ ":test-api-stubs-docs" ],
+    static_libs: [ "private-stub-annotations-jar" ],
     defaults: ["android_defaults_stubs_current"],
 }
 
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index e91fe25009b2d..67afc3225f7b8 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -1,14 +1,4 @@
 // Signature format: 2.0
-package android.annotation {
-
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface NonNull {
-  }
-
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface Nullable {
-  }
-
-}
-
 package android.net {
 
   public final class TetheredClient implements android.os.Parcelable {
diff --git a/core/java/android/annotation/NonNull.java b/core/java/android/annotation/NonNull.java
index c5aff9d6794e9..20472bacf6ad5 100644
--- a/core/java/android/annotation/NonNull.java
+++ b/core/java/android/annotation/NonNull.java
@@ -20,8 +20,6 @@ import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
-import android.annotation.SystemApi.Client;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -36,6 +34,5 @@ import java.lang.annotation.Target;
  */
 @Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})
-@SystemApi(client = Client.MODULE_LIBRARIES)
 public @interface NonNull {
 }
diff --git a/core/java/android/annotation/Nullable.java b/core/java/android/annotation/Nullable.java
index 2fcddfab93758..b8473e750c954 100644
--- a/core/java/android/annotation/Nullable.java
+++ b/core/java/android/annotation/Nullable.java
@@ -20,8 +20,6 @@ import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
-import android.annotation.SystemApi.Client;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -43,6 +41,5 @@ import java.lang.annotation.Target;
  */
 @Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})
-@SystemApi(client = Client.MODULE_LIBRARIES)
 public @interface Nullable {
 }