diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp
index ac887ab0..06f739c2 100644
--- a/battery_mitigation/battery_mitigation.cpp
+++ b/battery_mitigation/battery_mitigation.cpp
@@ -59,7 +59,7 @@ const struct MitigationConfig::Config cfg = {
         "main", "sub", "CPU2", "CPU1", "GPU", "TPU", "CAM", "DISP", "NPU",
         "voltage_now", "current_now",
     },
-    .LogFilePath = "/data/vendor/mitigation/lastmeal.txt",
+    .LogFilePath = "/data/vendor/mitigation/thismeal.txt",
 };
 
 int main(int /*argc*/, char ** /*argv*/) {
diff --git a/battery_mitigation/battery_mitigation.rc b/battery_mitigation/battery_mitigation.rc
index 7b9ef4f2..4cdbbf6e 100644
--- a/battery_mitigation/battery_mitigation.rc
+++ b/battery_mitigation/battery_mitigation.rc
@@ -1,3 +1,15 @@
+on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,ocp
+    copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt
+
+on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,if
+    copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt
+
+on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,main
+    copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt
+
+on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,sub
+    copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt
+
 on property:vendor.thermal.link_ready=1
     mkdir /data/vendor/mitigation 0755 system system
     chown system system /data/vendor/mitigation
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index bca12af1..0500f7de 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -725,8 +725,6 @@ on property:sys.boot_completed=1
 
     # Enable UFS powersaving
     write /dev/sys/block/bootdevice/clkgate_enable 1
-    # Disable dock-defend in Off Mode Charger
-    write /sys/devices/platform/google,charger/dd_state -1
 
     # Reset DDR frequency
     write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1
@@ -1017,6 +1015,8 @@ on property:persist.vendor.softmaxfreq.cl2=*
 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
+    # Disable dock-defend in Off Mode Charger
+    write /sys/devices/platform/google,charger/dd_state -1
 
 # Cpuset experiment
 on property:persist.device_config.vendor_system_native.top-app_cpuset=*
diff --git a/conf/ueventd.gs201.rc b/conf/ueventd.gs201.rc
index 5a50b638..1db5072b 100644
--- a/conf/ueventd.gs201.rc
+++ b/conf/ueventd.gs201.rc
@@ -119,6 +119,7 @@
 
 # IPC OEM
 /dev/oem_ipc*             0660   radio      radio
+/dev/oem_test             0660   radio      radio
 
 # interactive governor parameters
 /sys/devices/system/cpu/cpu*	cpufreq/interactive/timer_rate			0660	system	system
diff --git a/device-common.mk b/device-common.mk
index 81590245..0ceb1242 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -43,7 +43,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # ZramWriteback
 -include hardware/google/pixel/mm/device_gki.mk
-
-# Set thermal warm reset
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.thermal_warmreset = true