diff --git a/private/bug_map b/private/bug_map
index 9bc51543c8525adbdb53760cdd87d7f5032b2f1b..73cd3b4ca39cb6ba2713f0d9d317c77b7c180cc4 100644
--- a/private/bug_map
+++ b/private/bug_map
@@ -1,8 +1,3 @@
-crash_dump app_data_file dir 68319037
-crash_dump bluetooth_data_file dir 68319037
-crash_dump resourcecache_data_file dir 68319037
-crash_dump system_data_file file 68319037
-crash_dump vendor_overlay_file dir 68319037
 platform_app nfc_data_file dir 74331887
 priv_app sysfs dir 72749888
 priv_app sysfs_android_usb file 72749888
diff --git a/public/crash_dump.te b/public/crash_dump.te
index 74bff80609aabeb7a62b17ee833372c55c1bf933..6b6b986ee146b19e67835a8482862986eec186da 100644
--- a/public/crash_dump.te
+++ b/public/crash_dump.te
@@ -56,6 +56,16 @@ allow crash_dump tombstone_data_file:file { append getattr };
 
 read_logd(crash_dump)
 
+# Crash dump is not intended to access the following data types. Since these
+# are WAI, suppress the denials to clean up the logs.
+dontaudit crash_dump {
+  app_data_file
+  bluetooth_data_file
+  resourcecache_data_file
+  vendor_overlay_file
+}:dir search;
+dontaudit crash_dump system_data_file:file read;
+
 ###
 ### neverallow assertions
 ###