diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml
index 3c403c1..9b28124 100644
--- a/audio/husky/config/audio_platform_configuration.xml
+++ b/audio/husky/config/audio_platform_configuration.xml
@@ -179,8 +179,8 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml
index 2435e98..4748e6f 100644
--- a/audio/ripcurrent/config/audio_platform_configuration.xml
+++ b/audio/ripcurrent/config/audio_platform_configuration.xml
@@ -179,8 +179,8 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml
index 3c403c1..9b28124 100644
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -179,8 +179,8 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
diff --git a/avf/Android.bp b/avf/Android.bp
deleted file mode 100644
index d707db1..0000000
--- a/avf/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright (C) 2023 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-prebuilt_etc {
-    name: "shusky_assignable_devices.xml",
-    src: "assignable_devices.xml",
-    filename: "assignable_devices.xml",
-    vendor: true,
-    relative_install_path: "avf",
-}
diff --git a/avf/assignable_devices.xml b/avf/assignable_devices.xml
deleted file mode 100644
index baacffc..0000000
--- a/avf/assignable_devices.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<devices>
-    <device>
-        <kind>eh</kind>
-        <dtbo_label>eh</dtbo_label>
-        <sysfs_path>/sys/bus/platform/devices/16d00000.eh</sysfs_path>
-    </device>
-</devices>
diff --git a/device-husky.mk b/device-husky.mk
index 3954b89..40e1216 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -495,9 +495,6 @@ PRODUCT_PRODUCT_PROPERTIES ?= \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# AVF assignable devices xml
-PRODUCT_PACKAGES += shusky_assignable_devices.xml
-
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
@@ -522,8 +519,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
 
 # Bluetooth device id
+# Husky: 0x410D
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20493
+    bluetooth.device_id.product_id=16653
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-shiba.mk b/device-shiba.mk
index 276a933..206e4a6 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -464,9 +464,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# AVF assignable devices xml
-PRODUCT_PACKAGES += shusky_assignable_devices.xml
-
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
@@ -491,8 +488,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
 
 # Bluetooth device id
+# Shiba: 0x410E
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20492
+    bluetooth.device_id.product_id=16654
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index 63ef483..9240a13 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -45,6 +45,7 @@ include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk
 include device/google/shusky-sepolicy/husky-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
diff --git a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 5f36d8c..0680f65 100644
--- a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -188,11 +188,11 @@
     </array>
     <item name="gps.voltage">3700</item>
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">57</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">550</item>
     <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3700</item>
+    <item name="wifi.controller.voltage">3850</item>
 </device>
diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3
index 5a56e66..b4a758f 100644
--- a/location/gps.6.1.xml.hk3
+++ b/location/gps.6.1.xml.hk3
@@ -102,6 +102,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3
index 7887854..7e83262 100644
--- a/location/gps.6.1.xml.sb3
+++ b/location/gps.6.1.xml.sb3
@@ -102,6 +102,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index f58dc85..a8e0dd7 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -100,6 +100,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 4cc5731..1411732 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -100,6 +100,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3
index 2508944..34a3b23 100644
--- a/location/gps_user.6.1.xml.hk3
+++ b/location/gps_user.6.1.xml.hk3
@@ -100,6 +100,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3
index 2b05b75..4ae0f73 100644
--- a/location/gps_user.6.1.xml.sb3
+++ b/location/gps_user.6.1.xml.sb3
@@ -100,6 +100,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.xml b/location/gps_user.xml
index cd0892d..97f881e 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -98,6 +98,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index 2cf294d..bcce3ac 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -98,6 +98,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index c19e4b3..3101704 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -98,6 +98,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/manifest.xml b/manifest.xml
index e01d156..18109c6 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index f464ced..64fa155 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -81,8 +81,8 @@
       "Values": [
         "9999999",
         "1098000",
-        "1475000",
-        "975000",
+        "1425000",
+        "955000",
         "1197000",
         "1328000",
         "1548000",
@@ -96,7 +96,7 @@
       "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "1475000",
+        "1548000",
         "1197000",
         "0"
       ],
@@ -118,16 +118,13 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
-        "2253000",
+        "2245000",
         "2130000",
-        "1082000",
-        "1221000",
-        "1418000",
         "910000",
         "1328000",
-        "1622000",
+        "1572000",
         "1836000",
-        "1999000"
+        "1945000"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -137,10 +134,9 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "2253000",
+        "2245000",
         "2130000",
         "1836000",
-        "1221000",
         "0"
       ],
       "ResetOnInit": true
@@ -162,17 +158,13 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
-        "2704000",
-        "2507000",
-        "2252000",
-        "893000",
-        "1328000",
-        "1852000",
-        "1164000",
+        "2687000",
+        "2147000",
+        "1298000",
         "1557000",
         "1745000",
         "2049000",
-        "2409000"
+        "2363000"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -182,11 +174,10 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "2704000",
-        "2507000",
-        "2252000",
-        "1852000",
-        "1164000",
+        "2687000",
+        "2363000",
+        "2147000",
+        "1885000",
         "0"
       ],
       "ResetOnInit": true
@@ -228,7 +219,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -287,7 +277,7 @@
       "Path": "/proc/vendor_sched/cpu_skip_mask",
       "Values": [
         "0x0",
-        "0x80"
+        "0x100"
       ],
       "ResetOnInit": true
     },
@@ -315,7 +305,7 @@
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
       "Values": [
-        "765",
+        "720",
         "250",
         "0"
       ],
@@ -436,7 +426,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -466,6 +455,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x100"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -473,7 +471,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -737,7 +734,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
       "Values": [
         "2363000",
-        "1852000",
+        "1745000",
         "1298000"
       ],
       "DefaultIndex": 0
@@ -1341,7 +1338,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 1000,
-      "Value": "1852000"
+      "Value": "1885000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1365,13 +1362,13 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPULittleClusterMinFreq",
       "Duration": 1000,
-      "Value": "1475000"
+      "Value": "1548000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CAMUClampBoost",
       "Duration": 1000,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1455,19 +1452,19 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1485,7 +1482,7 @@
       "PowerHint": "CAMERA_SHOT",
       "Node": "CAMUClampBoost",
       "Duration": 100,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",
@@ -1539,13 +1536,13 @@
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "2704000"
+      "Value": "2687000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 3000,
-      "Value": "2704000"
+      "Value": "2687000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
@@ -1557,13 +1554,13 @@
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "2507000"
+      "Value": "2363000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 3000,
-      "Value": "2507000"
+      "Value": "2363000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
@@ -1575,13 +1572,13 @@
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "2252000"
+      "Value": "2147000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 3000,
-      "Value": "2252000"
+      "Value": "2147000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK1",
@@ -1599,13 +1596,13 @@
       "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3000,
-      "Value": "2253000"
+      "Value": "2245000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2",
       "Node": "CPUMidClusterMinFreq",
       "Duration": 3000,
-      "Value": "2253000"
+      "Value": "2245000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK3",
@@ -2253,19 +2250,19 @@
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
@@ -2525,7 +2522,7 @@
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "975000"
+      "Value": "955000"
     },
     {
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60",
@@ -2567,7 +2564,7 @@
       "PowerHint": "LOW_POWER_MID_CLUSTER_70",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "LOW_POWER_MID_CLUSTER_80",
@@ -2579,13 +2576,13 @@
       "PowerHint": "LOW_POWER_MID_CLUSTER_90",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1999000"
+      "Value": "1945000"
     },
     {
       "PowerHint": "LOW_POWER_CPU_50",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1328000"
+      "Value": "1298000"
     },
     {
       "PowerHint": "LOW_POWER_CPU_60",
@@ -2609,7 +2606,7 @@
       "PowerHint": "LOW_POWER_CPU_90",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "2409000"
+      "Value": "2363000"
     },
     {
       "PowerHint": "LOW_POWER",
@@ -2890,7 +2887,7 @@
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 500,
-      "Value": "1852000"
+      "Value": "1885000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
@@ -2992,7 +2989,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_LIMIT_FREQ",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3040,19 +3037,19 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 1f2ae91..7a34efb 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -214,7 +214,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -273,7 +272,7 @@
       "Path": "/proc/vendor_sched/cpu_skip_mask",
       "Values": [
         "0x0",
-        "0x80"
+        "0x100"
       ],
       "ResetOnInit": true
     },
@@ -301,7 +300,7 @@
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
       "Values": [
-        "765",
+        "720",
         "250",
         "0"
       ],
@@ -422,7 +421,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -452,6 +450,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x100"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -459,7 +466,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -1347,7 +1353,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CAMUClampBoost",
       "Duration": 1000,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1443,7 +1449,7 @@
       "PowerHint": "CAMERA_SHOT",
       "Node": "CAMUClampBoost",
       "Duration": 100,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 26f7ea9..bccce89 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -81,8 +81,8 @@
       "Values": [
         "9999999",
         "1098000",
-        "1475000",
-        "975000",
+        "1425000",
+        "955000",
         "1197000",
         "1328000",
         "1548000",
@@ -96,7 +96,7 @@
       "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "1475000",
+        "1548000",
         "1197000",
         "0"
       ],
@@ -118,14 +118,11 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
-        "1082000",
-        "1221000",
-        "1418000",
         "910000",
         "1328000",
-        "1622000",
+        "1572000",
         "1836000",
-        "1999000"
+        "1945000"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -136,7 +133,6 @@
       "Values": [
         "9999999",
         "1836000",
-        "1221000",
         "0"
       ],
       "ResetOnInit": true
@@ -158,14 +154,11 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
-        "893000",
-        "1328000",
-        "1852000",
-        "1164000",
+        "1298000",
         "1557000",
         "1745000",
         "2049000",
-        "2409000"
+        "2363000"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -175,8 +168,7 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "1852000",
-        "1164000",
+        "1885000",
         "0"
       ],
       "ResetOnInit": true
@@ -218,7 +210,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -287,7 +278,7 @@
       "Path": "/proc/vendor_sched/cpu_skip_mask",
       "Values": [
         "0x0",
-        "0x80"
+        "0x100"
       ],
       "ResetOnInit": true
     },
@@ -315,7 +306,7 @@
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
       "Values": [
-        "765",
+        "720",
         "250",
         "0"
       ],
@@ -436,7 +427,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -466,6 +456,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x100"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -473,7 +472,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -737,7 +735,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
       "Values": [
         "2363000",
-        "1852000",
+        "1745000",
         "1298000"
       ],
       "DefaultIndex": 0
@@ -1347,7 +1345,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 1000,
-      "Value": "1852000"
+      "Value": "1885000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1371,13 +1369,13 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPULittleClusterMinFreq",
       "Duration": 1000,
-      "Value": "1475000"
+      "Value": "1548000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CAMUClampBoost",
       "Duration": 1000,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1461,19 +1459,19 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1491,7 +1489,7 @@
       "PowerHint": "CAMERA_SHOT",
       "Node": "CAMUClampBoost",
       "Duration": 100,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",
@@ -2151,19 +2149,19 @@
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
@@ -2429,7 +2427,7 @@
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "975000"
+      "Value": "955000"
     },
     {
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60",
@@ -2471,7 +2469,7 @@
       "PowerHint": "LOW_POWER_MID_CLUSTER_70",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "LOW_POWER_MID_CLUSTER_80",
@@ -2483,13 +2481,13 @@
       "PowerHint": "LOW_POWER_MID_CLUSTER_90",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1999000"
+      "Value": "1945000"
     },
     {
       "PowerHint": "LOW_POWER_CPU_50",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1328000"
+      "Value": "1298000"
     },
     {
       "PowerHint": "LOW_POWER_CPU_60",
@@ -2513,7 +2511,7 @@
       "PowerHint": "LOW_POWER_CPU_90",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "2409000"
+      "Value": "2363000"
     },
     {
       "PowerHint": "LOW_POWER",
@@ -2794,7 +2792,7 @@
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 500,
-      "Value": "1852000"
+      "Value": "1885000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
@@ -2896,7 +2894,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_LIMIT_FREQ",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -2944,19 +2942,19 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk
index a84d4b0..142e21a 100644
--- a/ripcurrent/BoardConfig.mk
+++ b/ripcurrent/BoardConfig.mk
@@ -31,5 +31,6 @@ include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/shusky-sepolicy/ripcurrent-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index 30d204e..847a288 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -41,6 +41,7 @@ include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk
 include device/google/shusky-sepolicy/shiba-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
diff --git a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 5f36d8c..0680f65 100644
--- a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -188,11 +188,11 @@
     </array>
     <item name="gps.voltage">3700</item>
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">57</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">550</item>
     <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3700</item>
+    <item name="wifi.controller.voltage">3850</item>
 </device>