diff --git a/debian/postinst b/debian/postinst
index 64fc720..cbe1563 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -74,11 +74,19 @@ case $device in
   ;;
 esac
 
-[ -e /lib/udev/rules.d/80-keyboard.rules ] || \
-    cp /usr/lib/gemian/udev-rules/80-keyboard-$device.rules /lib/udev/rules.d/80-keyboard.rules
+if cmp -s /lib/udev/rules.d/80-keyboard.rules /usr/lib/gemian/udev-rules/80-keyboard-$device.rules;
+then
+  echo Keyboard rules in place
+else
+  cp /usr/lib/gemian/udev-rules/80-keyboard-$device.rules /lib/udev/rules.d/80-keyboard.rules
+fi
 
-[ -e /lib/udev/rules.d/70-$device.rules ] || \
-    cp /usr/lib/gemian/udev-rules/70-$device.rules /lib/udev/rules.d/
+if cmp -s /lib/udev/rules.d/70-$device.rules /usr/lib/gemian/udev-rules/70-$device.rules;
+then
+  echo Device rules in place
+else
+  cp /usr/lib/gemian/udev-rules/70-$device.rules /lib/udev/rules.d/
+fi
 
 echo "Target checksum $target_checksum"
 
diff --git a/udev/rules.d/70-mt6873.rules b/udev/rules.d/70-mt6873.rules
index f106f66..3ccd3e7 100644
--- a/udev/rules.d/70-mt6873.rules
+++ b/udev/rules.d/70-mt6873.rules
@@ -5,153 +5,153 @@ ACTION=="add", KERNEL=="ptmx", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="tty", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="random", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="urandom", OWNER="root", GROUP="root", MODE="0666"
-ACTION=="add", KERNEL=="hw_random", OWNER="root", GROUP="system", MODE="0440"
+ACTION=="add", KERNEL=="hw_random", OWNER="root", GROUP="aid_system", MODE="0440"
 ACTION=="add", KERNEL=="ashmem", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="binder", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="hwbinder", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="vndbinder", OWNER="root", GROUP="root", MODE="0666"
-ACTION=="add", KERNEL=="pmsg0", OWNER="root", GROUP="log", MODE="0222"
-ACTION=="add", KERNEL=="dri/*", OWNER="root", GROUP="graphics", MODE="0666"
-ACTION=="add", KERNEL=="uhid", OWNER="uhid", GROUP="uhid", MODE="0660"
-ACTION=="add", KERNEL=="uinput", OWNER="uhid", GROUP="uhid", MODE="0660"
-ACTION=="add", KERNEL=="rtc0", OWNER="system", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="tty0", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="graphics/*", OWNER="root", GROUP="graphics", MODE="0660"
+ACTION=="add", KERNEL=="pmsg0", OWNER="root", GROUP="aid_log", MODE="0222"
+ACTION=="add", KERNEL=="dri/*", OWNER="root", GROUP="aid_graphics", MODE="0666"
+ACTION=="add", KERNEL=="uhid", OWNER="aid_input", GROUP="aid_input", MODE="0660"
+ACTION=="add", KERNEL=="uinput", OWNER="aid_input", GROUP="aid_input", MODE="0660"
+ACTION=="add", KERNEL=="rtc0", OWNER="aid_system", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="tty0", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="graphics/*", OWNER="root", GROUP="aid_graphics", MODE="0660"
 ACTION=="add", KERNEL=="input/*", OWNER="root", GROUP="input", MODE="0660"
 ACTION=="add", KERNEL=="v4l-touch*", OWNER="root", GROUP="input", MODE="0660"
-ACTION=="add", KERNEL=="snd/*", OWNER="system", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="bus/usb/*", OWNER="root", GROUP="usb", MODE="0660"
+ACTION=="add", KERNEL=="snd/*", OWNER="aid_system", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="bus/usb/*", OWNER="root", GROUP="aid_usb", MODE="0660"
 ACTION=="add", KERNEL=="mtp_usb", OWNER="root", GROUP="plugdev", MODE="0660"
-ACTION=="add", KERNEL=="usb_accessory", OWNER="root", GROUP="usb", MODE="0660"
-ACTION=="add", KERNEL=="tun", OWNER="system", GROUP="vpn", MODE="0660"
-ACTION=="add", KERNEL=="ppp", OWNER="radio", GROUP="vpn", MODE="0660"
-ACTION=="add", KERNEL=="block/mmcblk0", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/mmcblk0boot0", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/mmcblk0boot1", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="misc-sd", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/misc2", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/boot", OWNER="root", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/recovery", OWNER="root", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/secro", OWNER="root", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/seccfg", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/proinfo", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/nvram", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/para", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/logo", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/frp", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1img", OWNER="root", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1img_1", OWNER="root", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1img_a", OWNER="root", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1img_b", OWNER="root", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1dsp", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/boot_para", OWNER="root", GROUP="system", MODE="0640"
-ACTION=="add", KERNEL=="otp", OWNER="system", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/otp", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="stpwmt", OWNER="system", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="wmtdetect", OWNER="system", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="fw_log_wmt", OWNER="system", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="stpbt", OWNER="bluetooth", GROUP="bluetooth", MODE="0660"
-ACTION=="add", KERNEL=="fw_log_bt", OWNER="bluetooth", GROUP="bluetooth", MODE="0660"
-ACTION=="add", KERNEL=="stpgps", OWNER="gps", GROUP="gps", MODE="0660"
-ACTION=="add", KERNEL=="gps", OWNER="gps", GROUP="gps", MODE="0660"
-ACTION=="add", KERNEL=="fw_log_gps", OWNER="gps", GROUP="gps", MODE="0660"
-ACTION=="add", KERNEL=="stpant", OWNER="system", GROUP="system", MODE="0660"
+ACTION=="add", KERNEL=="usb_accessory", OWNER="root", GROUP="aid_usb", MODE="0660"
+ACTION=="add", KERNEL=="tun", OWNER="aid_system", GROUP="aid_vpn", MODE="0660"
+ACTION=="add", KERNEL=="ppp", OWNER="radio", GROUP="aid_vpn", MODE="0660"
+ACTION=="add", KERNEL=="block/mmcblk0", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/mmcblk0boot0", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/mmcblk0boot1", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="misc-sd", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/misc2", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/boot", OWNER="root", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/recovery", OWNER="root", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/secro", OWNER="root", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/seccfg", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/proinfo", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/nvram", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/para", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/logo", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/frp", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1img", OWNER="root", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1img_1", OWNER="root", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1img_a", OWNER="root", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1img_b", OWNER="root", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/md1dsp", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/boot_para", OWNER="root", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="otp", OWNER="aid_system", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/platform/bootdevice/by-name/otp", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="stpwmt", OWNER="aid_system", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="wmtdetect", OWNER="aid_system", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="fw_log_wmt", OWNER="aid_system", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="stpbt", OWNER="aid_bluetooth", GROUP="aid_bluetooth", MODE="0660"
+ACTION=="add", KERNEL=="fw_log_bt", OWNER="aid_bluetooth", GROUP="aid_bluetooth", MODE="0660"
+ACTION=="add", KERNEL=="stpgps", OWNER="aid_gps", GROUP="aid_gps", MODE="0660"
+ACTION=="add", KERNEL=="gps", OWNER="aid_gps", GROUP="aid_gps", MODE="0660"
+ACTION=="add", KERNEL=="fw_log_gps", OWNER="aid_gps", GROUP="aid_gps", MODE="0660"
+ACTION=="add", KERNEL=="stpant", OWNER="aid_system", GROUP="aid_system", MODE="0660"
 ACTION=="add", KERNEL=="wmtWifi", OWNER="radio", GROUP="radio", MODE="0660"
-ACTION=="add", KERNEL=="fw_log_wifi", OWNER="wifi", GROUP="wifi", MODE="0660"
-ACTION=="add", KERNEL=="fm", OWNER="media", GROUP="media", MODE="0660"
+ACTION=="add", KERNEL=="fw_log_wifi", OWNER="aid_wifi", GROUP="aid_wifi", MODE="0660"
+ACTION=="add", KERNEL=="fm", OWNER="aid_media", GROUP="aid_media", MODE="0660"
 ACTION=="add", KERNEL=="msr3110", OWNER="root", GROUP="root", MODE="0666"
-ACTION=="add", KERNEL=="mt6605", OWNER="nfc", GROUP="radio", MODE="0660"
-ACTION=="add", KERNEL=="st21nfc", OWNER="nfc", GROUP="radio", MODE="0660"
-ACTION=="add", KERNEL=="btif", OWNER="system", GROUP="system", MODE="0600"
-ACTION=="add", KERNEL=="trusty-ipc-dev0", OWNER="system", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="block/mmcblk0rpmb", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="mobicore", OWNER="system", GROUP="system", MODE="0600"
-ACTION=="add", KERNEL=="mobicore-user", OWNER="system", GROUP="system", MODE="0666"
-ACTION=="add", KERNEL=="t-base-tui", OWNER="system", GROUP="system", MODE="0666"
-ACTION=="add", KERNEL=="bus/usb/*", OWNER="root", GROUP="usb", MODE="0660"
+ACTION=="add", KERNEL=="mt6605", OWNER="aid_nfc", GROUP="radio", MODE="0660"
+ACTION=="add", KERNEL=="st21nfc", OWNER="aid_nfc", GROUP="radio", MODE="0660"
+ACTION=="add", KERNEL=="btif", OWNER="aid_system", GROUP="aid_system", MODE="0600"
+ACTION=="add", KERNEL=="trusty-ipc-dev0", OWNER="aid_system", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="block/mmcblk0rpmb", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="mobicore", OWNER="aid_system", GROUP="aid_system", MODE="0600"
+ACTION=="add", KERNEL=="mobicore-user", OWNER="aid_system", GROUP="aid_system", MODE="0666"
+ACTION=="add", KERNEL=="t-base-tui", OWNER="aid_system", GROUP="aid_system", MODE="0666"
+ACTION=="add", KERNEL=="bus/usb/*", OWNER="root", GROUP="aid_usb", MODE="0660"
 ACTION=="add", KERNEL=="ttyUSB0", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="ttyUSB1", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="ttyUSB2", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="ttyUSB3", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="ttyUSB4", OWNER="radio", GROUP="radio", MODE="0660"
-ACTION=="add", KERNEL=="log/ksystem", OWNER="root", GROUP="log", MODE="0600"
+ACTION=="add", KERNEL=="log/ksystem", OWNER="root", GROUP="aid_log", MODE="0600"
 ACTION=="add", KERNEL=="ccci*", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="ttyC*", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="eemcs*", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="emd*", OWNER="radio", GROUP="radio", MODE="0660"
-ACTION=="add", KERNEL=="ccci_pcm_rx", OWNER="audio", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="ccci_pcm_tx", OWNER="audio", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="ccci_aud", OWNER="audio", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="ccci2_aud", OWNER="audio", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="ccci3_aud", OWNER="audio", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="ccci_raw_audio", OWNER="audio", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="ccci3_raw_audio", OWNER="audio", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="eemcs_aud", OWNER="audio", GROUP="audio", MODE="0660"
-ACTION=="add", KERNEL=="irtx", OWNER="system", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="ir-learning", OWNER="system", GROUP="system", MODE="0660"
+ACTION=="add", KERNEL=="ccci_pcm_rx", OWNER="aid_audio", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="ccci_pcm_tx", OWNER="aid_audio", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="ccci_aud", OWNER="aid_audio", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="ccci2_aud", OWNER="aid_audio", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="ccci3_aud", OWNER="aid_audio", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="ccci_raw_audio", OWNER="aid_audio", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="ccci3_raw_audio", OWNER="aid_audio", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="eemcs_aud", OWNER="aid_audio", GROUP="aid_audio", MODE="0660"
+ACTION=="add", KERNEL=="irtx", OWNER="aid_system", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="ir-learning", OWNER="aid_system", GROUP="aid_system", MODE="0660"
 ACTION=="add", KERNEL=="pvrsrvkm", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="pvr_sync", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="mtgpio", OWNER="radio", GROUP="root", MODE="0600"
-ACTION=="add", KERNEL=="ttySDIO*", OWNER="radio", GROUP="sdcard_rw", MODE="0660"
+ACTION=="add", KERNEL=="ttySDIO*", OWNER="radio", GROUP="aid_sdcard_rw", MODE="0660"
 ACTION=="add", KERNEL=="ttyRB*", OWNER="radio", GROUP="radio", MODE="0660"
-ACTION=="add", KERNEL=="mali", OWNER="system", GROUP="graphics", MODE="0666"
-ACTION=="add", KERNEL=="ion", OWNER="system", GROUP="graphics", MODE="0666"
-ACTION=="add", KERNEL=="touch", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="hotknot", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="RT_Monitor", OWNER="system"	, GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="kick_powerkey", OWNER="system", GROUP="system", MODE="0660"
+ACTION=="add", KERNEL=="mali", OWNER="aid_system", GROUP="aid_graphics", MODE="0666"
+ACTION=="add", KERNEL=="ion", OWNER="aid_system", GROUP="aid_graphics", MODE="0666"
+ACTION=="add", KERNEL=="touch", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="hotknot", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="RT_Monitor", OWNER="aid_system"	, GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="kick_powerkey", OWNER="aid_system", GROUP="aid_system", MODE="0660"
 ACTION=="add", KERNEL=="ttyACM0", OWNER="radio", GROUP="radio", MODE="0660"
 
 # Added from init.mt6768.rc
-ACTION=="add", KERNEL=="scp", OWNER="root", GROUP="system", MODE="0444"
-ACTION=="add", KERNEL=="sspm", OWNER="root", GROUP="system", MODE="0440"
-ACTION=="add", KERNEL=="pmem_multimedia", OWNER="system", GROUP="system", MODE="0666"
+ACTION=="add", KERNEL=="scp", OWNER="root", GROUP="aid_system", MODE="0444"
+ACTION=="add", KERNEL=="sspm", OWNER="root", GROUP="aid_system", MODE="0440"
+ACTION=="add", KERNEL=="pmem_multimedia", OWNER="aid_system", GROUP="aid_system", MODE="0666"
 # CMDQ
-ACTION=="add", KERNEL=="mtk_cmdq", OWNER="system", GROUP="system", MODE="0644"
+ACTION=="add", KERNEL=="mtk_cmdq", OWNER="aid_system", GROUP="aid_system", MODE="0644"
 # MDP SYNC
-ACTION=="add", KERNEL=="mdp_sync", OWNER="system", GROUP="system", MODE="0644"
+ACTION=="add", KERNEL=="mdp_sync", OWNER="aid_system", GROUP="aid_system", MODE="0644"
 # OPEN DSP
-ACTION=="add", KERNEL=="audio_ipi", OWNER="system", GROUP="android_media", MODE="0640"
+ACTION=="add", KERNEL=="audio_ipi", OWNER="aid_system", GROUP="aid_media", MODE="0640"
 # SmartPA
-ACTION=="add", KERNEL=="audio_scp", OWNER="system", GROUP="android_media", MODE="0640"
+ACTION=="add", KERNEL=="audio_scp", OWNER="aid_system", GROUP="aid_media", MODE="0640"
 # VideoCodec
-ACTION=="add", KERNEL=="vcu", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="video0", OWNER="system", GROUP="android_media", MODE="0666"
-ACTION=="add", KERNEL=="video1", OWNER="system", GROUP="android_media", MODE="0666"
+ACTION=="add", KERNEL=="vcu", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="video0", OWNER="aid_system", GROUP="aid_media", MODE="0666"
+ACTION=="add", KERNEL=="video1", OWNER="aid_system", GROUP="aid_media", MODE="0666"
 # Android SEC related device nodes
-ACTION=="add", KERNEL=="sec", OWNER="root", GROUP="system", MODE="0660"
-ACTION=="add", KERNEL=="sar", OWNER="root", GROUP="system", MODE="0666"
+ACTION=="add", KERNEL=="sec", OWNER="root", GROUP="aid_system", MODE="0660"
+ACTION=="add", KERNEL=="sar", OWNER="root", GROUP="aid_system", MODE="0666"
 # gz device
-ACTION=="add", KERNEL=="gz_kree", OWNER="system", GROUP="android_media", MODE="0660"
+ACTION=="add", KERNEL=="gz_kree", OWNER="aid_system", GROUP="aid_media", MODE="0660"
 # Camera
-ACTION=="add", KERNEL=="camera-sysram", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-isp", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-dip", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-tsf", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-dpe", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-mfb", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-rsc", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-owe", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-fdvt", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-wpe", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="camera-pipemgr", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="kd_camera_hw", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="seninf", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="flashlight", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="kd_camera_hw_bus2", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="FM50AF", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="CAM_CAL_DRV", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="MAINAF", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="MAIN2AF", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="MAIN3AF", OWNER="system", GROUP="android_media", MODE="0660"
-ACTION=="add", KERNEL=="SUBAF", OWNER="system", GROUP="android_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-sysram", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-isp", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-dip", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-tsf", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-dpe", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-mfb", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-rsc", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-owe", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-fdvt", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-wpe", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="camera-pipemgr", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="kd_camera_hw", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="seninf", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="flashlight", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="kd_camera_hw_bus2", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="FM50AF", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="CAM_CAL_DRV", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="MAINAF", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="MAIN2AF", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="MAIN3AF", OWNER="aid_system", GROUP="aid_media", MODE="0660"
+ACTION=="add", KERNEL=="SUBAF", OWNER="aid_system", GROUP="aid_media", MODE="0660"
 # CCU
-ACTION=="add", KERNEL=="ccu", OWNER="system", GROUP="android_media", MODE="0666"
+ACTION=="add", KERNEL=="ccu", OWNER="aid_system", GROUP="aid_media", MODE="0666"
 # VOW
-ACTION=="add", KERNEL=="vow", OWNER="system", GROUP="android_media", MODE="0640"
+ACTION=="add", KERNEL=="vow", OWNER="aid_system", GROUP="aid_media", MODE="0640"
 # SMI
-ACTION=="add", KERNEL=="MTK_SMI", OWNER="system", GROUP="android_media", MODE="0660"
+ACTION=="add", KERNEL=="MTK_SMI", OWNER="aid_system", GROUP="aid_media", MODE="0660"
 # DFRC
-ACTION=="add", KERNEL=="mtk_dfrc", OWNER="system", GROUP="android_graphics", MODE="0660"
+ACTION=="add", KERNEL=="mtk_dfrc", OWNER="aid_system", GROUP="aid_graphics", MODE="0660"
 # usip
-ACTION=="add", KERNEL=="usip", OWNER="system", GROUP="android_media", MODE="0660"
+ACTION=="add", KERNEL=="usip", OWNER="aid_system", GROUP="aid_media", MODE="0660"