diff --git a/bluetooth.te b/bluetooth.te
index b90e48feb8642654e23c0bb754248dc0cbfb737b..863cbd8777c2e2f6a05a98d371d2380b6cd7ecb7 100644
--- a/bluetooth.te
+++ b/bluetooth.te
@@ -60,8 +60,6 @@ allow bluetooth system_api_service:service_manager find;
 service_manager_local_audit_domain(bluetooth)
 auditallow bluetooth {
     tmp_system_server_service
-    -display_service
-    -dropbox_service
     -media_session_service
     -network_management_service
     -power_service
diff --git a/nfc.te b/nfc.te
index 156aeb703fb8af283f5f9d1ad3385494e8fe4f9b..6532c6853207a353c74c1edaf488df2c61a2f76b 100644
--- a/nfc.te
+++ b/nfc.te
@@ -30,8 +30,6 @@ allow nfc system_api_service:service_manager find;
 service_manager_local_audit_domain(nfc)
 auditallow nfc {
     tmp_system_server_service
-    -display_service
-    -dropbox_service
     -network_management_service
     -power_service
     -registry_service
diff --git a/platform_app.te b/platform_app.te
index 0016f2070923337a4121f19461e402f6528e8dbe..3676c5d3f4dd6284161010a45f59c2e17eb7bbb0 100644
--- a/platform_app.te
+++ b/platform_app.te
@@ -39,13 +39,6 @@ allow platform_app system_api_service:service_manager find;
 service_manager_local_audit_domain(platform_app)
 auditallow platform_app {
     tmp_system_server_service
-    -display_service
-    -dreams_service
-    -dropbox_service
-    -fingerprint_service
-    -graphicsstats_service
-    -input_method_service
-    -input_service
     -lock_settings_service
     -media_projection_service
     -media_router_service
diff --git a/radio.te b/radio.te
index 060c3a61234546881ebfac5b43f85af286d8ee01..f71d02fde694976aea37edfb0ba3847f9b0931a7 100644
--- a/radio.te
+++ b/radio.te
@@ -41,10 +41,6 @@ allow radio system_api_service:service_manager find;
 service_manager_local_audit_domain(radio)
 auditallow radio {
     tmp_system_server_service
-    -display_service
-    -dropbox_service
-    -imms_service
-    -input_method_service
     -netstats_service
     -network_management_service
     -notification_service
diff --git a/service.te b/service.te
index b4925acdf5c7d62d00cc88f4758e38b016a2115e..451c9d08016a1cf5d35e74ab0a1ed9562a5d0ad7 100644
--- a/service.te
+++ b/service.te
@@ -36,19 +36,19 @@ type dbinfo_service, system_api_service, system_server_service, service_manager_
 type device_policy_service, app_api_service, system_server_service, service_manager_type;
 type deviceidle_service, system_server_service, service_manager_type;
 type devicestoragemonitor_service, system_server_service, service_manager_type;
-type diskstats_service, tmp_system_server_service, service_manager_type;
-type display_service, tmp_system_server_service, service_manager_type;
+type diskstats_service, system_api_service, system_server_service, service_manager_type;
+type display_service, app_api_service, system_server_service, service_manager_type;
 type DockObserver_service, system_server_service, service_manager_type;
-type dreams_service, tmp_system_server_service, service_manager_type;
-type dropbox_service, tmp_system_server_service, service_manager_type;
-type ethernet_service, tmp_system_server_service, service_manager_type;
-type fingerprint_service, tmp_system_server_service, service_manager_type;
+type dreams_service, system_api_service, system_server_service, service_manager_type;
+type dropbox_service, app_api_service, system_server_service, service_manager_type;
+type ethernet_service, app_api_service, system_server_service, service_manager_type;
+type fingerprint_service, app_api_service, system_server_service, service_manager_type;
 type gfxinfo_service, system_api_service, system_server_service, service_manager_type;
-type graphicsstats_service, tmp_system_server_service, service_manager_type;
-type hardware_service, tmp_system_server_service, service_manager_type;
-type hdmi_control_service, tmp_system_server_service, service_manager_type;
-type input_method_service, tmp_system_server_service, service_manager_type;
-type input_service, tmp_system_server_service, service_manager_type;
+type graphicsstats_service, app_api_service, system_server_service, service_manager_type;
+type hardware_service, system_server_service, service_manager_type;
+type hdmi_control_service, system_api_service, system_server_service, service_manager_type;
+type input_method_service, app_api_service, system_server_service, service_manager_type;
+type input_service, app_api_service, system_server_service, service_manager_type;
 type imms_service, app_api_service, system_server_service, service_manager_type;
 type jobscheduler_service, tmp_system_server_service, service_manager_type;
 type launcherapps_service, tmp_system_server_service, service_manager_type;
diff --git a/system_app.te b/system_app.te
index e55525e4139c05261e18591a279a271311dff8b2..7d934d12a99daf9f563e3f6e1dcfba2c9cda5473 100644
--- a/system_app.te
+++ b/system_app.te
@@ -60,13 +60,6 @@ allow system_app system_api_service:service_manager find;
 service_manager_local_audit_domain(system_app)
 auditallow system_app {
     tmp_system_server_service
-    -display_service
-    -dreams_service
-    -dropbox_service
-    -fingerprint_service
-    -graphicsstats_service
-    -input_method_service
-    -input_service
     -lock_settings_service
     -media_session_service
     -mount_service
diff --git a/system_server.te b/system_server.te
index 4480684a2d9d67c09d259f0a3f8709757f3b4418..80e06e834216a0b7254d907256eda7d849f17c2d 100644
--- a/system_server.te
+++ b/system_server.te
@@ -372,14 +372,6 @@ allow system_server tmp_system_server_service:service_manager { add find };
 service_manager_local_audit_domain(system_server)
 auditallow system_server {
     tmp_system_server_service
-    -display_service
-    -dreams_service
-    -dropbox_service
-    -ethernet_service
-    -graphicsstats_service
-    -hdmi_control_service
-    -input_method_service
-    -input_service
     -jobscheduler_service
     -location_service
     -lock_settings_service
diff --git a/untrusted_app.te b/untrusted_app.te
index a139799dd30d0c978b938dc6111bd1582a65720e..a51c6eaafea8b557cda3a5db4dbc17f2ba35bc51 100644
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -90,14 +90,7 @@ allow untrusted_app system_api_service:service_manager find;
 service_manager_local_audit_domain(untrusted_app)
 auditallow untrusted_app {
     tmp_system_server_service
-    -diskstats_service
-    -display_service
-    -dropbox_service
-    -graphicsstats_service
     -healthd_service
-    -imms_service
-    -input_method_service
-    -input_service
     -jobscheduler_service
     -launcherapps_service
     -location_service