diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index 27d1829..5c46db2 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -1087,11 +1087,15 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="Hotword Tap Enable" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
 
-  <path name="microphones -> hotword-lookback-capture-0" />
+  <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
 
   <path name="ultrasound-microphones -> ultrasound-capture-0">
     <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
@@ -1335,12 +1339,6 @@
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
-  <path name="microphones (VOICE_RECOGNITION,SOUND_TRIGGER_TAP)">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
-    <ctl name="Hotword Tap Enable" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
   <path name="microphones (SOUND_TRIGGER_AEC)">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 4f92223..3750cba 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -3,8 +3,18 @@
 # Uart port name
 UartPort = /dev/ttySAC18
 
-# Userial type
-# UserialType = 2
+# Priority of uart type
+# HciUartSocket = 0
+# SerialUartPort = 1
+# SerialAocUartPort = 2
+# UserialInvalid = 3
+UserialTypePriority = 2-1
+
+# <string> The hardware support which offload capability
+BtOffloadCap = AOC
+
+# <string> The BT Offload Trunk Flag Group Name
+BtOffloadTrunkGroup = 24P_AOC
 
 # <boolean> Enable check whether let aoc controls power pin
 AocPowerPinCtrlCheckEnable = true
diff --git a/device-comet.mk b/device-comet.mk
index de54ead..208c85d 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -204,10 +204,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.audio.stereo_spatialization_enabled=true
 
-# Sound Dose
+ifneq ($(USE_AUDIO_HAL_AIDL),true)
+# HIDL Sound Dose
 PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
 	audio_sounddose_aoc
+endif
 
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -275,7 +277,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Location
 # iGNSS
-include device/google/gs-common/gps/lsi/s5400.mk
 # gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/comet/location
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 6a0712c..1e40b7b 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -28,8 +28,8 @@ bdsUsedInUSPolicy=2
 sbasUsedInUSPolicy=2
 qzssUsedInUSPolicy=2
 navicUsedInUSPolicy=2
-Chip_Configuration_FeatureCfg_DVS = 0
-Chip_Configuration_FeatureCfg_DFS = 0
+Chip_Configuration_FeatureCfg_DVS = 1
+Chip_Configuration_FeatureCfg_DFS = 1
 mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
@@ -61,7 +61,7 @@ RfPathLossDb_L5_Ap=4300
 RfPathLossDb_L5_Cp=4300
 IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
-isUseUncalAccel=0
+isUseUncalAccel=1
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 2ae1f26..480bf79 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -115,8 +115,8 @@ navicUsedInUSPolicy=2
 
 # DVS: 0 = Disabled, 1 = Enabled (default)
 # DFS: 0 = Disabled, 1 = Enabled (default)
-Chip_Configuration_FeatureCfg_DVS = 0
-Chip_Configuration_FeatureCfg_DFS = 0
+Chip_Configuration_FeatureCfg_DVS = 1
+Chip_Configuration_FeatureCfg_DFS = 1
 
 # This is a bitfield that will disable incoming interrupts for mailboxes
 # AP   = 0x1
@@ -193,7 +193,7 @@ IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 
 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data
-isUseUncalAccel=0
+isUseUncalAccel=1
 
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 1fc4523..c5fe44a 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -2617,25 +2617,19 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
       "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"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1885000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "1"
     },
     {