diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index c6c21a5b..e01c79a3 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -1101,10 +1101,6 @@ on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running
# Enable UFS powersaving in Off Mode Charger
write /dev/sys/block/bootdevice/clkgate_enable 1
-# AOC in off-mode charging
-on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running
- setprop vendor.aocd 1
-
# MTE
on property:persist.device_config.runtime_native_boot.bootloader_override=force_on
# Per-core mode overrides.
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 35da0534..4c8c5758 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -59,6 +59,7 @@
+