diff --git a/power-libperfmgr/android.hardware.power-service.moto_sm6375-libperfmgr.rc b/power-libperfmgr/android.hardware.power-service.moto_sm6375-libperfmgr.rc
index 2ee36e2..bf35a71 100644
--- a/power-libperfmgr/android.hardware.power-service.moto_sm6375-libperfmgr.rc
+++ b/power-libperfmgr/android.hardware.power-service.moto_sm6375-libperfmgr.rc
@@ -13,5 +13,14 @@ on property:init.svc.zygote=restarting && property:vendor.powerhal.state=*
 
 # restart powerHAL when audioHAL died
 on property:init.svc.vendor.audio-hal-2-0=restarting && property:vendor.powerhal.audio=AUDIO_STREAMING_LOW_LATENCY
-   setprop vendor.powerhal.audio ""
-   restart vendor.power-hal-aidl
+    setprop vendor.powerhal.audio ""
+    restart vendor.power-hal-aidl
+
+# Clean up after b/163539793 resolved
+on property:vendor.powerhal.dalvik.vm.dex2oat-threads=*
+    setprop dalvik.vm.dex2oat-threads ${vendor.powerhal.dalvik.vm.dex2oat-threads}
+    setprop dalvik.vm.restore-dex2oat-threads ${vendor.powerhal.dalvik.vm.dex2oat-threads}
+
+on property:vendor.powerhal.dalvik.vm.dex2oat-cpu-set=*
+    setprop dalvik.vm.dex2oat-cpu-set ${vendor.powerhal.dalvik.vm.dex2oat-cpu-set}
+    setprop dalvik.vm.restore-dex2oat-cpu-set ${vendor.powerhal.dalvik.vm.dex2oat-cpu-set}