diff --git a/app.te b/app.te
index 45225b5..3240392 100644
--- a/app.te
+++ b/app.te
@@ -243,7 +243,7 @@
 # Access to any of the following character devices.
 neverallow appdomain {
     audio_device
-    camera_device
+    video_device
     dm_device
     radio_device
     gps_device
diff --git a/device.te b/device.te
index 06006b2..5175034 100644
--- a/device.te
+++ b/device.te
@@ -6,7 +6,6 @@
 type audio_device, dev_type;
 type binder_device, dev_type, mlstrustedobject;
 type block_device, dev_type;
-type camera_device, dev_type;
 type dm_device, dev_type;
 type loop_device, dev_type;
 type pmsg_device, dev_type, mlstrustedobject;
@@ -101,3 +100,6 @@
 
 # Bootctrl block device used by A/B update (update_engine, update_verifier).
 type bootctrl_block_device, dev_type;
+
+# XXX: Temporarily alias camera_device for its removal
+typealias video_device alias camera_device;
diff --git a/file_contexts b/file_contexts
index a1fa804..1cd5fba 100644
--- a/file_contexts
+++ b/file_contexts
@@ -60,7 +60,7 @@
 /dev/block/ram[0-9]*	u:object_r:ram_device:s0
 /dev/block/zram[0-9]*	u:object_r:ram_device:s0
 /dev/bus/usb(.*)?       u:object_r:usb_device:s0
-/dev/cam		u:object_r:camera_device:s0
+/dev/cam		u:object_r:video_device:s0
 /dev/console		u:object_r:console_device:s0
 /dev/cpuctl(/.*)?	u:object_r:cpuctl_device:s0
 /dev/device-mapper	u:object_r:dm_device:s0
diff --git a/mediaserver.te b/mediaserver.te
index e1c9a54..84ceec8 100644
--- a/mediaserver.te
+++ b/mediaserver.te
@@ -47,8 +47,6 @@
 # Use pipes passed over Binder from app domains.
 allow mediaserver appdomain:fifo_file { getattr read write };
 
-# Access camera device.
-allow mediaserver camera_device:chr_file rw_file_perms;
 allow mediaserver rpmsg_device:chr_file rw_file_perms;
 
 # Inter System processes communicate over named pipe (FIFO)