diff --git a/tracking_denials/mediacodec.te b/tracking_denials/mediacodec.te
index 3955ae14..2d3f4475 100644
--- a/tracking_denials/mediacodec.te
+++ b/tracking_denials/mediacodec.te
@@ -4,10 +4,3 @@ dontaudit mediacodec sysfs:file { open };
 dontaudit mediacodec sysfs:file { read };
 # b/176777184
 dontaudit mediacodec default_android_vndservice:service_manager add ;
-# b/182086552
-dontaudit mediacodec dmabuf_heap_device:chr_file { open };
-dontaudit mediacodec dmabuf_heap_device:chr_file { read };
-dontaudit mediacodec dmabuf_heap_device:chr_file { ioctl };
-dontaudit mediacodec dmabuf_heap_device:chr_file { read };
-dontaudit mediacodec dmabuf_heap_device:chr_file { open };
-dontaudit mediacodec dmabuf_heap_device:chr_file { ioctl };
diff --git a/tracking_denials/mediaserver.te b/tracking_denials/mediaserver.te
deleted file mode 100644
index 5b1f85ae..00000000
--- a/tracking_denials/mediaserver.te
+++ /dev/null
@@ -1,10 +0,0 @@
-# b/182086686
-dontaudit mediaserver dmabuf_heap_device:chr_file { open };
-dontaudit mediaserver dmabuf_heap_device:chr_file { ioctl };
-dontaudit mediaserver dmabuf_heap_device:chr_file { ioctl };
-dontaudit mediaserver dmabuf_heap_device:chr_file { read };
-dontaudit mediaserver dmabuf_heap_device:chr_file { read };
-dontaudit mediaserver dmabuf_heap_device:chr_file { open };
-dontaudit mediaserver dmabuf_heap_device:chr_file { ioctl };
-dontaudit mediaserver dmabuf_heap_device:chr_file { ioctl };
-dontaudit mediaserver dmabuf_heap_device:chr_file { ioctl };
diff --git a/tracking_denials/mediaswcodec.te b/tracking_denials/mediaswcodec.te
deleted file mode 100644
index 90396e8d..00000000
--- a/tracking_denials/mediaswcodec.te
+++ /dev/null
@@ -1,7 +0,0 @@
-# b/182086550
-dontaudit mediaswcodec dmabuf_heap_device:chr_file { open };
-dontaudit mediaswcodec dmabuf_heap_device:chr_file { read };
-dontaudit mediaswcodec dmabuf_heap_device:chr_file { read };
-dontaudit mediaswcodec dmabuf_heap_device:chr_file { ioctl };
-dontaudit mediaswcodec dmabuf_heap_device:chr_file { open };
-dontaudit mediaswcodec dmabuf_heap_device:chr_file { ioctl };
diff --git a/tracking_denials/nfc.te b/tracking_denials/nfc.te
deleted file mode 100644
index c0904dcf..00000000
--- a/tracking_denials/nfc.te
+++ /dev/null
@@ -1,4 +0,0 @@
-# b/182086551
-dontaudit nfc dmabuf_heap_device:chr_file { open };
-dontaudit nfc dmabuf_heap_device:chr_file { ioctl };
-dontaudit nfc dmabuf_heap_device:chr_file { read };
diff --git a/tracking_denials/platform_app.te b/tracking_denials/platform_app.te
index 2f9c64f4..6e8841af 100644
--- a/tracking_denials/platform_app.te
+++ b/tracking_denials/platform_app.te
@@ -6,7 +6,3 @@ dontaudit platform_app hal_wlc:binder { call };
 dontaudit platform_app hal_wlc_hwservice:hwservice_manager { find };
 dontaudit platform_app hal_wlc:binder { call };
 dontaudit platform_app hal_wlc:binder { transfer };
-# b/182086482
-dontaudit platform_app dmabuf_heap_device:chr_file { ioctl };
-dontaudit platform_app dmabuf_heap_device:chr_file { read };
-dontaudit platform_app dmabuf_heap_device:chr_file { open };
diff --git a/tracking_denials/system_server.te b/tracking_denials/system_server.te
index 2f1e9463..d7e456ab 100644
--- a/tracking_denials/system_server.te
+++ b/tracking_denials/system_server.te
@@ -1,6 +1,2 @@
 # b/178980142
 dontaudit system_server property_type:file *;
-# b/182086481
-dontaudit system_server dmabuf_heap_device:chr_file { ioctl };
-dontaudit system_server dmabuf_heap_device:chr_file { open };
-dontaudit system_server dmabuf_heap_device:chr_file { read };
diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts
index e1ae842f..68bcf67f 100644
--- a/whitechapel/vendor/google/file_contexts
+++ b/whitechapel/vendor/google/file_contexts
@@ -397,3 +397,7 @@
 
 # vscaler-secure DMA-BUF heap
 /dev/dma_heap/vscaler-secure                                                   u:object_r:vscaler_heap_device:s0
+
+# video system DMA-BUF heap
+/dev/dma_heap/video_system                                               u:object_r:dmabuf_system_heap_device:s0
+/dev/dma_heap/video_system-uncached                                      u:object_r:dmabuf_system_heap_device:s0