diff --git a/framework/Android.bp b/framework/Android.bp
index 93ef3bf4ed..ee3a5d58de 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -97,8 +97,6 @@ java_sdk_library {
         ],
     },
     impl_only_libs: [
-        // TODO (b/183097033) remove once module_current includes core_platform
-        "stable.core.platform.api.stubs",
         "framework-tethering.stubs.module_lib",
         "framework-wifi.stubs.module_lib",
         "net-utils-device-common",
diff --git a/service/Android.bp b/service/Android.bp
index 9d76e19d62..32a5b4fe65 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -57,8 +57,6 @@ java_library {
         ":net-module-utils-srcs",
     ],
     libs: [
-        // TODO (b/183097033) remove once system_server_current includes core_current
-        "stable.core.platform.api.stubs",
         "android_system_server_stubs_current",
         "framework-annotations-lib",
         "framework-connectivity.impl",