diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml
index 4f00e94..153f117 100644
--- a/audio/cheetah/config/mixer_paths.xml
+++ b/audio/cheetah/config/mixer_paths.xml
@@ -31,7 +31,7 @@
     <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
 
     <!-- Enable it when AOC is ready to trim delay and padding -->
-    <!--ctl name="Gapless Offload Enable" value="1"/-->
+    <ctl name="Gapless Offload Enable" value="1"/>
 
     <!-- TDM 0 setting -->
     <ctl name="TDM_0_RX Chan" value="Four"/>
diff --git a/audio/cheetah/tuning/fortemedia/HANDSET.dat b/audio/cheetah/tuning/fortemedia/HANDSET.dat
index 444bd70..e63d51b 100644
Binary files a/audio/cheetah/tuning/fortemedia/HANDSET.dat and b/audio/cheetah/tuning/fortemedia/HANDSET.dat differ
diff --git a/audio/cheetah/tuning/fortemedia/HANDSET.mods b/audio/cheetah/tuning/fortemedia/HANDSET.mods
index 6dac592..78f7999 100644
--- a/audio/cheetah/tuning/fortemedia/HANDSET.mods
+++ b/audio/cheetah/tuning/fortemedia/HANDSET.mods
@@ -1,7 +1,7 @@
 #PLATFORM_NAME  gChip
 #EXPORT_FLAG  HANDSET
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2022-08-03 16:28:21
+#SAVE_TIME  2022-09-01 10:32:03
 
 #CASE_NAME  HANDSET-HANDSET-RESERVE1-FB
 #PARAM_MODE  FULL
@@ -8918,8 +8918,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x00A0    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0140    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0012    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -11588,8 +11588,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x0140    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x01C2    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x000A    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -14258,8 +14258,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -19598,8 +19598,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x00A0    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0140    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0012    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -22268,8 +22268,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x0140    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x01C2    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x000A    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -24938,8 +24938,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -30278,8 +30278,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x00A0    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0140    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0012    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -32948,8 +32948,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x0140    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x01C2    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x000A    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -35618,8 +35618,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -40958,8 +40958,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x00A0    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0140    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0012    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -43628,8 +43628,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x0140    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x01C2    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x000A    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -46298,8 +46298,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -51638,8 +51638,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -62318,8 +62318,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml
index 4f00e94..153f117 100644
--- a/audio/panther/config/mixer_paths.xml
+++ b/audio/panther/config/mixer_paths.xml
@@ -31,7 +31,7 @@
     <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
 
     <!-- Enable it when AOC is ready to trim delay and padding -->
-    <!--ctl name="Gapless Offload Enable" value="1"/-->
+    <ctl name="Gapless Offload Enable" value="1"/>
 
     <!-- TDM 0 setting -->
     <ctl name="TDM_0_RX Chan" value="Four"/>
diff --git a/audio/panther/tuning/fortemedia/HANDSET.dat b/audio/panther/tuning/fortemedia/HANDSET.dat
index 62eed7c..685f367 100644
Binary files a/audio/panther/tuning/fortemedia/HANDSET.dat and b/audio/panther/tuning/fortemedia/HANDSET.dat differ
diff --git a/audio/panther/tuning/fortemedia/HANDSET.mods b/audio/panther/tuning/fortemedia/HANDSET.mods
index 205a95a..bf379df 100644
--- a/audio/panther/tuning/fortemedia/HANDSET.mods
+++ b/audio/panther/tuning/fortemedia/HANDSET.mods
@@ -1,7 +1,7 @@
 #PLATFORM_NAME  gChip
 #EXPORT_FLAG  HANDSET
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2022-08-03 16:47:35
+#SAVE_TIME  2022-09-01 10:44:07
 
 #CASE_NAME  HANDSET-HANDSET-RESERVE1-FB
 #PARAM_MODE  FULL
@@ -8918,8 +8918,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x00A0    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0140    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0012    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -11588,8 +11588,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x0140    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x01C2    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x000A    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -14258,8 +14258,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -19598,8 +19598,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x00A0    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0140    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0012    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -22268,8 +22268,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x0140    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x01C2    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x000A    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -24938,8 +24938,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -30278,8 +30278,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x00A0    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0140    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0012    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -32948,8 +32948,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x0140    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x01C2    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x000A    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -35618,8 +35618,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -40958,8 +40958,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x00A0    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0140    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0012    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -43628,8 +43628,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x0320    //TX_MICMUTE_RATIO_THR
-900    0x0140    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x01C2    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x000A    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -46298,8 +46298,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -51638,8 +51638,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
@@ -62318,8 +62318,8 @@
 897    0x2329    //TX_SENDFUNC_REG_MICMUTE
 898    0x0010    //TX_SENDFUNC_REG_MICMUTE1
 899    0x03E8    //TX_MICMUTE_RATIO_THR
-900    0x01A4    //TX_MICMUTE_AMP_THR
-901    0x0004    //TX_MICMUTE_HPF_IND
+900    0x0226    //TX_MICMUTE_AMP_THR
+901    0x0000    //TX_MICMUTE_HPF_IND
 902    0x00C0    //TX_MICMUTE_LOG_EYR_TH
 903    0x0008    //TX_MICMUTE_CVG_TIME
 904    0x0008    //TX_MICMUTE_RELEASE_TIME
diff --git a/device-cheetah.mk b/device-cheetah.mk
index fb37119..0e62814 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -240,10 +240,14 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+                device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 else
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+                device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 endif
 
 # Set support one-handed mode
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index d90c4af..c579fba 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -164,10 +164,15 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+                device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/pantah/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/pantah/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 else
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+                device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/pantah/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/pantah/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+
 endif
 
 # Set zram size
diff --git a/device-panther.mk b/device-panther.mk
index 926fab4..ea3735d 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -227,10 +227,14 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+                device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 else
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+                device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 endif
 
 # Set support one-handed mode
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index 27a1cdd..c18b4eb 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -166,10 +166,14 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+                device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/pantah/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/pantah/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 else
         PRODUCT_COPY_FILES += \
-                device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+                device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+                device/google/pantah/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+                device/google/pantah/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 endif
 
 # Set zram size
diff --git a/location/gps.xml b/location/gps.xml
index 183c754..ab21290 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -60,9 +60,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index c711773..7dd2e8d 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -60,9 +60,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index 60a0ba5..2396a74 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -60,9 +60,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index de1f5f8..87b789d 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -59,9 +59,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index 8b1f2dd..7daeba3 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -59,9 +59,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index be6353b..9becbf6 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -59,9 +59,11 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/location/lhd.conf b/location/lhd.conf
new file mode 100644
index 0000000..c000d58
--- /dev/null
+++ b/location/lhd.conf
@@ -0,0 +1,34 @@
+LheName=bbd
+
+LheRsmResetTimeoutMS=10000
+GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
+
+LhePatch=/vendor/firmware/SensorHub.patch
+Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
+LheConsole=/data/vendor/gps/LheConsole
+
+LogEnabled=true
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+
+LheBbdPacket=/dev/ttyBCM
+
+LheBbdControl=/dev/bbd_control
+
+# LheBbdSensor=/dev/bbd_sensor
+
+LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
+LogLevel=*:I
+
+NvStorageDir=/data/vendor/gps/
+
+# Enable BBD debugging at these stages:
+# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
+
+LheAutoBaudDelayMS=10
+TrafficLogEnabled=false
+SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
+
+SkipSensorWakeLock=true
+LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/location/lhd.conf.c10 b/location/lhd.conf.c10
new file mode 100644
index 0000000..c000d58
--- /dev/null
+++ b/location/lhd.conf.c10
@@ -0,0 +1,34 @@
+LheName=bbd
+
+LheRsmResetTimeoutMS=10000
+GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
+
+LhePatch=/vendor/firmware/SensorHub.patch
+Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
+LheConsole=/data/vendor/gps/LheConsole
+
+LogEnabled=true
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+
+LheBbdPacket=/dev/ttyBCM
+
+LheBbdControl=/dev/bbd_control
+
+# LheBbdSensor=/dev/bbd_sensor
+
+LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
+LogLevel=*:I
+
+NvStorageDir=/data/vendor/gps/
+
+# Enable BBD debugging at these stages:
+# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
+
+LheAutoBaudDelayMS=10
+TrafficLogEnabled=false
+SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
+
+SkipSensorWakeLock=true
+LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/location/lhd.conf.p10 b/location/lhd.conf.p10
new file mode 100644
index 0000000..c000d58
--- /dev/null
+++ b/location/lhd.conf.p10
@@ -0,0 +1,34 @@
+LheName=bbd
+
+LheRsmResetTimeoutMS=10000
+GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
+
+LhePatch=/vendor/firmware/SensorHub.patch
+Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
+LheConsole=/data/vendor/gps/LheConsole
+
+LogEnabled=true
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+
+LheBbdPacket=/dev/ttyBCM
+
+LheBbdControl=/dev/bbd_control
+
+# LheBbdSensor=/dev/bbd_sensor
+
+LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
+LogLevel=*:I
+
+NvStorageDir=/data/vendor/gps/
+
+# Enable BBD debugging at these stages:
+# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
+
+LheAutoBaudDelayMS=10
+TrafficLogEnabled=false
+SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
+
+SkipSensorWakeLock=true
+LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/location/lhd_user.conf b/location/lhd_user.conf
new file mode 100644
index 0000000..682d03a
--- /dev/null
+++ b/location/lhd_user.conf
@@ -0,0 +1,32 @@
+LheName=bbd
+
+LheRsmResetTimeoutMS=10000
+GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
+
+LhePatch=/vendor/firmware/SensorHub.patch
+Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
+# LheConsole=/data/vendor/gps/LheConsole
+
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+
+LheBbdPacket=/dev/ttyBCM
+
+LheBbdControl=/dev/bbd_control
+
+# LheBbdSensor=/dev/bbd_sensor
+
+# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
+
+NvStorageDir=/data/vendor/gps/
+
+# Enable BBD debugging at these stages:
+# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
+
+LheAutoBaudDelayMS=10
+TrafficLogEnabled=false
+
+SkipSensorWakeLock=true
+LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/location/lhd_user.conf.c10 b/location/lhd_user.conf.c10
new file mode 100644
index 0000000..682d03a
--- /dev/null
+++ b/location/lhd_user.conf.c10
@@ -0,0 +1,32 @@
+LheName=bbd
+
+LheRsmResetTimeoutMS=10000
+GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
+
+LhePatch=/vendor/firmware/SensorHub.patch
+Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
+# LheConsole=/data/vendor/gps/LheConsole
+
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+
+LheBbdPacket=/dev/ttyBCM
+
+LheBbdControl=/dev/bbd_control
+
+# LheBbdSensor=/dev/bbd_sensor
+
+# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
+
+NvStorageDir=/data/vendor/gps/
+
+# Enable BBD debugging at these stages:
+# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
+
+LheAutoBaudDelayMS=10
+TrafficLogEnabled=false
+
+SkipSensorWakeLock=true
+LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/location/lhd_user.conf.p10 b/location/lhd_user.conf.p10
new file mode 100644
index 0000000..682d03a
--- /dev/null
+++ b/location/lhd_user.conf.p10
@@ -0,0 +1,32 @@
+LheName=bbd
+
+LheRsmResetTimeoutMS=10000
+GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
+
+LhePatch=/vendor/firmware/SensorHub.patch
+Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
+# LheConsole=/data/vendor/gps/LheConsole
+
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+
+LheBbdPacket=/dev/ttyBCM
+
+LheBbdControl=/dev/bbd_control
+
+# LheBbdSensor=/dev/bbd_sensor
+
+# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
+
+NvStorageDir=/data/vendor/gps/
+
+# Enable BBD debugging at these stages:
+# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
+
+LheAutoBaudDelayMS=10
+TrafficLogEnabled=false
+
+SkipSensorWakeLock=true
+LoggerWakeLockEnable=false
+PpsEnable=true
diff --git a/location/scd.conf b/location/scd.conf
new file mode 100644
index 0000000..43f9cd2
--- /dev/null
+++ b/location/scd.conf
@@ -0,0 +1,6 @@
+LogEnabled=true
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20
+SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf
diff --git a/location/scd.conf.c10 b/location/scd.conf.c10
new file mode 100644
index 0000000..43f9cd2
--- /dev/null
+++ b/location/scd.conf.c10
@@ -0,0 +1,6 @@
+LogEnabled=true
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20
+SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf
diff --git a/location/scd.conf.p10 b/location/scd.conf.p10
new file mode 100644
index 0000000..43f9cd2
--- /dev/null
+++ b/location/scd.conf.p10
@@ -0,0 +1,6 @@
+LogEnabled=true
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20
+SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf
diff --git a/location/scd_user.conf b/location/scd_user.conf
new file mode 100644
index 0000000..e75f209
--- /dev/null
+++ b/location/scd_user.conf
@@ -0,0 +1,5 @@
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20
diff --git a/location/scd_user.conf.c10 b/location/scd_user.conf.c10
new file mode 100644
index 0000000..e75f209
--- /dev/null
+++ b/location/scd_user.conf.c10
@@ -0,0 +1,5 @@
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20
diff --git a/location/scd_user.conf.p10 b/location/scd_user.conf.p10
new file mode 100644
index 0000000..e75f209
--- /dev/null
+++ b/location/scd_user.conf.p10
@@ -0,0 +1,5 @@
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 772b4e8..6d30d99 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -523,6 +523,28 @@
         "1"
       ],
       "DefaultIndex": 0
+    },
+    {
+      "Name": "Dex2oatThreads",
+      "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads",
+      "Values": [
+        "1",
+        "2",
+        "4",
+        "6",
+        "8"
+      ],
+      "Type": "Property"
+    },
+    {
+      "Name": "Dex2oatCPUSet",
+      "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set",
+      "Values": [
+        "0,1,2,3",
+        "0,1,2,3,4,5",
+        "0,1,2,3,4,5,6,7"
+      ],
+      "Type": "Property"
     }
   ],
   "Actions": [
@@ -1554,76 +1576,286 @@
       "Value": "60000"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "9999999"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "6"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 1000,
-      "Value": "9999999"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3,4,5"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "PMU_POLL",
+      "Duration": 0,
       "Value": "1"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "AurControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "AurSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "4"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "PMU_POLL",
+      "Duration": 0,
       "Value": "1"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "AurControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "AurSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "4"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "PMU_POLL",
+      "Duration": 0,
       "Value": "1"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "9999999"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 1000,
-      "Value": "9999999"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "TRUSTY_VIRTIO_HIGH",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "AurControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "TRUSTY_HIGH",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "AurSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "2"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3"
     },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
@@ -1721,6 +1953,90 @@
       "Duration": 0,
       "Value": "60000"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPU_BIG_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPU_BIG_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "TRUSTY_VIRTIO_HIGH",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "TRUSTY_HIGH",
+      "Duration": 1000,
+      "Value": "1"
+    },
     {
       "PowerHint": "ML_ACC",
       "Node": "MLUclampBoost",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index e037835..830220e 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -503,6 +503,28 @@
         "1"
       ],
       "DefaultIndex": 0
+    },
+    {
+      "Name": "Dex2oatThreads",
+      "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads",
+      "Values": [
+        "1",
+        "2",
+        "4",
+        "6",
+        "8"
+      ],
+      "Type": "Property"
+    },
+    {
+      "Name": "Dex2oatCPUSet",
+      "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set",
+      "Values": [
+        "0,1,2,3",
+        "0,1,2,3,4,5",
+        "0,1,2,3,4,5,6,7"
+      ],
+      "Type": "Property"
     }
   ],
   "Actions": [
@@ -1411,76 +1433,286 @@
       "Value": "60000"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "9999999"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "6"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 1000,
-      "Value": "9999999"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3,4,5"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "PMU_POLL",
+      "Duration": 0,
       "Value": "1"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "AurControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "AurSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "4"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "PMU_POLL",
+      "Duration": 0,
       "Value": "1"
     },
     {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "AurControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "AurSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "4"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "PMU_POLL",
+      "Duration": 0,
       "Value": "1"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "9999999"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPUBigClusterMinFreq",
-      "Duration": 1000,
-      "Value": "9999999"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "TRUSTY_VIRTIO_HIGH",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "AurControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
     },
     {
-      "PowerHint": "FP_BOOST",
-      "Node": "TRUSTY_HIGH",
-      "Duration": 1000,
-      "Value": "1"
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "AurSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "2"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3"
     },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
@@ -1578,6 +1810,90 @@
       "Duration": 0,
       "Value": "60000"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
+      "Node": "Dex2oatThreads",
+      "Duration": 0,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
+      "Node": "Dex2oatCPUSet",
+      "Duration": 0,
+      "Value": "0,1,2,3"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPU_BIG_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPU_LITTLE_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPU_MID_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "CPU_BIG_TSKIN_BYPASS",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "TRUSTY_VIRTIO_HIGH",
+      "Duration": 1000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "FP_BOOST",
+      "Node": "TRUSTY_HIGH",
+      "Duration": 1000,
+      "Value": "1"
+    },
     {
       "PowerHint": "ML_ACC",
       "Node": "MLUclampBoost",