diff --git a/audio/cheetah/tuning/waves/waves_preset.mps b/audio/cheetah/tuning/waves/waves_preset.mps
index e5bad88..9462823 100644
Binary files a/audio/cheetah/tuning/waves/waves_preset.mps and b/audio/cheetah/tuning/waves/waves_preset.mps differ
diff --git a/audio/panther/config/audio_policy_volumes.xml b/audio/panther/config/audio_policy_volumes.xml
index 75162ee..0e80999 100644
--- a/audio/panther/config/audio_policy_volumes.xml
+++ b/audio/panther/config/audio_policy_volumes.xml
@@ -79,8 +79,13 @@ volume index from 0 to 100.
                                        ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                        ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-6200</point>
+        <point>20,-4700</point>
+        <point>40,-3000</point>
+        <point>60,-1700</point>
+        <point>100,0</point>
+    </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
diff --git a/audio/panther/tuning/waves/waves_preset.mps b/audio/panther/tuning/waves/waves_preset.mps
index 49c846f..6e6f689 100644
Binary files a/audio/panther/tuning/waves/waves_preset.mps and b/audio/panther/tuning/waves/waves_preset.mps differ
diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 68584f6..469ef39 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -173,15 +173,15 @@
     <item name="audio">75</item>
 
     <!-- Cellular modem related values.-->
-    <item name="modem.controller.sleep">0</item>
-    <item name="modem.controller.idle">156</item>
-    <item name="modem.controller.rx">145</item>
+    <item name="modem.controller.sleep">2.5</item>
+    <item name="modem.controller.idle">4.5</item>
+    <item name="modem.controller.rx">169</item>
     <array name="modem.controller.tx"> <!-- Strength 0 to 4 -->
-        <value>153</value>
-        <value>212</value>
-        <value>292</value>
-        <value>359</value>
-        <value>471</value>
+        <value>223</value>
+        <value>243</value>
+        <value>298</value>
+        <value>573</value>
+        <value>668</value>
     </array>
     <item name="modem.controller.voltage">3700</item>
 
diff --git a/location/gps.xml b/location/gps.xml
index 12ef997..e920f8c 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -85,6 +85,7 @@
 
        EnableOnChipStopNotification="2"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index b0e9dae..0cdb090 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -85,6 +85,7 @@
 
        EnableOnChipStopNotification="2"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index b4db436..09c2276 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -85,6 +85,7 @@
 
        EnableOnChipStopNotification="2"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 0a2edae..fb93405 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -84,6 +84,7 @@
 
        EnableOnChipStopNotification="0"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index 3d218a9..1ce83a5 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -84,6 +84,7 @@
 
        EnableOnChipStopNotification="0"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index 119897c..b2c7ba1 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -84,6 +84,7 @@
 
        EnableOnChipStopNotification="0"
        PowerMode="3"
+       MinGpsWeekNumber="2216"
   />
 
   <gll_features
diff --git a/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index f84c9bd..9bd7052 100644
--- a/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -173,15 +173,15 @@
     <item name="audio">75</item>
 
     <!-- Cellular modem related values.-->
-    <item name="modem.controller.sleep">0</item>
-    <item name="modem.controller.idle">156</item>
-    <item name="modem.controller.rx">145</item>
+    <item name="modem.controller.sleep">2.5</item>
+    <item name="modem.controller.idle">4.5</item>
+    <item name="modem.controller.rx">169</item>
     <array name="modem.controller.tx"> <!-- Strength 0 to 4 -->
-        <value>153</value>
-        <value>212</value>
-        <value>292</value>
-        <value>359</value>
-        <value>471</value>
+        <value>223</value>
+        <value>243</value>
+        <value>298</value>
+        <value>573</value>
+        <value>668</value>
     </array>
     <item name="modem.controller.voltage">3700</item>
 
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index 695a0c6..1c48f4c 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -511,22 +511,7 @@
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"BCL_AUDIO_BAACL",
@@ -547,22 +532,7 @@
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"vdroop2",
@@ -571,22 +541,7 @@
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"smpl_gm",
@@ -595,22 +550,7 @@
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"ocp_cpu1",
diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json
index a597fac..95bde43 100644
--- a/thermal_info_config_cloudripper.json
+++ b/thermal_info_config_cloudripper.json
@@ -174,22 +174,7 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"BCL_AUDIO_BAACL",
@@ -242,22 +227,7 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"vdroop2",
@@ -283,22 +253,7 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"smpl_gm",
@@ -324,22 +279,7 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"ocp_cpu1",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index c125ac2..5e06475 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -512,22 +512,7 @@
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"BCL_AUDIO_BAACL",
@@ -548,22 +533,7 @@
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"vdroop2",
@@ -572,22 +542,7 @@
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"smpl_gm",
@@ -596,22 +551,7 @@
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"ocp_cpu1",
diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json
index 26e5dbd..f417914 100644
--- a/thermal_info_config_ravenclaw.json
+++ b/thermal_info_config_ravenclaw.json
@@ -376,22 +376,7 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"BCL_AUDIO_BAACL",
@@ -444,22 +429,7 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"vdroop2",
@@ -485,22 +455,7 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"smpl_gm",
@@ -526,22 +481,7 @@
             "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
-            "PollingDelay":0,
-            "PassiveDelay":1000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
+            "PassiveDelay":7000
         },
         {
             "Name":"ocp_cpu1",