diff --git a/conf/init.husky.rc b/conf/init.husky.rc
index c21c473..1b81446 100644
--- a/conf/init.husky.rc
+++ b/conf/init.husky.rc
@@ -94,6 +94,27 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
     chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
     chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_env_rel_coef
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_env_rel_coef
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_env_rel_coef
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_rise_headroom
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_rise_headroom
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_rise_headroom
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_fall_headroom
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_fall_headroom
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_fall_headroom
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_enable
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_enable
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_enable
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_thresh_fs
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_thresh_fs
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_thresh_fs
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_hold_off_ms
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_hold_off_ms
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_hold_off_ms
+    chown system system /sys/bus/i2c/devices/6-0043/default/pm_active_timeout_ms
+    chown system system /sys/bus/i2c/devices/5-0043/default/pm_active_timeout_ms
+    chown system system /sys/bus/i2c/devices/4-0043/default/pm_active_timeout_ms
 
     enable vendor.vibrator.cs40l26
 
diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc
index fe53956..e4c97a2 100644
--- a/conf/init.shiba.rc
+++ b/conf/init.shiba.rc
@@ -90,6 +90,27 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
     chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
     chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_env_rel_coef
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_env_rel_coef
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_env_rel_coef
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_rise_headroom
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_rise_headroom
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_rise_headroom
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_fall_headroom
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_fall_headroom
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_fall_headroom
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_enable
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_enable
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_enable
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_thresh_fs
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_thresh_fs
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_thresh_fs
+    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_hold_off_ms
+    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_hold_off_ms
+    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_hold_off_ms
+    chown system system /sys/bus/i2c/devices/6-0043/default/pm_active_timeout_ms
+    chown system system /sys/bus/i2c/devices/5-0043/default/pm_active_timeout_ms
+    chown system system /sys/bus/i2c/devices/4-0043/default/pm_active_timeout_ms
 
     enable vendor.vibrator.cs40l26
 
diff --git a/device-husky.mk b/device-husky.mk
index 8252d38..052b4bb 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -246,14 +246,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
@@ -339,7 +332,14 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.vibrator.hal.context.scale=60 \
     persist.vendor.vibrator.hal.context.fade=true \
     persist.vendor.vibrator.hal.context.cooldowntime=1600 \
-    persist.vendor.vibrator.hal.context.settlingtime=5000
+    persist.vendor.vibrator.hal.context.settlingtime=5000 \
+    ro.vendor.vibrator.hal.dbc.enable=true \
+    ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \
+    ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \
+    ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \
+    ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \
+    ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \
+    ro.vendor.vibrator.hal.pm.activetimeout=5
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 77d5c9b..b74d75e 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -204,14 +204,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
diff --git a/device-shiba.mk b/device-shiba.mk
index 543ce77..185e0f8 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -236,14 +236,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
@@ -320,7 +313,14 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.vibrator.hal.context.scale=60 \
     persist.vendor.vibrator.hal.context.fade=true \
     persist.vendor.vibrator.hal.context.cooldowntime=1600 \
-    persist.vendor.vibrator.hal.context.settlingtime=5000
+    persist.vendor.vibrator.hal.context.settlingtime=5000 \
+    ro.vendor.vibrator.hal.dbc.enable=true \
+    ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \
+    ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \
+    ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \
+    ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \
+    ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \
+    ro.vendor.vibrator.hal.pm.activetimeout=5
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/factory_husky.mk b/factory_husky.mk
index 54cbdd7..5c2c0ce 100644
--- a/factory_husky.mk
+++ b/factory_husky.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-husky.mk)
 include device/google/shusky/audio/husky/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_husky
 PRODUCT_DEVICE := husky
diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk
index 37d0f63..b7c64c5 100644
--- a/factory_ripcurrent.mk
+++ b/factory_ripcurrent.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-ripcurrent.mk)
 include device/google/shusky/audio/ripcurrent/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_ripcurrent
 PRODUCT_DEVICE := ripcurrent
diff --git a/factory_shiba.mk b/factory_shiba.mk
index 365a2f1..d20f113 100644
--- a/factory_shiba.mk
+++ b/factory_shiba.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-shiba.mk)
 include device/google/shusky/audio/shiba/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_shiba
 PRODUCT_DEVICE := shiba
diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml
index 64c20b4..53e81f7 100644
--- a/husky/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml
@@ -312,4 +312,7 @@
     <!-- Boolean indicating whether allow sending null to modem to clear the previous initial attach
          data profile -->
     <bool name="allow_clear_initial_attach_data_profile">true</bool>
+
+    <!-- The integer index of the selected option in config_udfps_touch_detection_options -->
+    <integer name="config_selected_udfps_touch_detection">4</integer>
 </resources>
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index e9bbc34..c14d30a 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -1472,6 +1472,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "DsuMinFreq",
+      "Duration": 0,
+      "Value": "820000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_LIMIT_FREQ",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 7340cc7..bbfbbf1 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -1361,6 +1361,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "DsuMinFreq",
+      "Duration": 0,
+      "Value": "820000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_LIMIT_FREQ",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 746dc1c..77be402 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -1360,6 +1360,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "DsuMinFreq",
+      "Duration": 0,
+      "Value": "820000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_LIMIT_FREQ",