diff --git a/services/Android.bp b/services/Android.bp
index c77e75da66ba8..db6e21a62ff37 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -114,9 +114,10 @@ droidstubs {
     name: "services-stubs.sources",
     srcs: [":services-all-sources"],
     installable: false,
-    // TODO: remove the --hide options below
     args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" +
         " --hide-annotation android.annotation.Hide" +
+        " --hide InternalClasses" + // com.android.* classes are okay in this interface
+        // TODO: remove the --hide options below
         " --hide-package com.google.android.startop.iorap" +
         " --hide ReferencesHidden" +
         " --hide DeprecationMismatch" +
diff --git a/services/api/lint-baseline.txt b/services/api/lint-baseline.txt
index 0b8658cf469d3..b42a258725450 100644
--- a/services/api/lint-baseline.txt
+++ b/services/api/lint-baseline.txt
@@ -1,20 +1,4 @@
 // Baseline format: 1.0
-InternalClasses: com.android.permission.persistence.RuntimePermissionsPersistence:
-    Internal classes must not be exposed
-InternalClasses: com.android.permission.persistence.RuntimePermissionsState:
-    Internal classes must not be exposed
-InternalClasses: com.android.permission.persistence.RuntimePermissionsState.PermissionState:
-    Internal classes must not be exposed
-InternalClasses: com.android.role.persistence.RolesPersistence:
-    Internal classes must not be exposed
-InternalClasses: com.android.role.persistence.RolesState:
-    Internal classes must not be exposed
-InternalClasses: com.android.server.SystemService:
-    Internal classes must not be exposed
-InternalClasses: com.android.server.SystemService.TargetUser:
-    Internal classes must not be exposed
-
-
 ProtectedMember: com.android.server.SystemService#publishBinderService(String, android.os.IBinder):
     Protected methods not allowed; must be public: method com.android.server.SystemService.publishBinderService(String,android.os.IBinder)}
 ProtectedMember: com.android.server.SystemService#publishBinderService(String, android.os.IBinder, boolean):