diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index 8b8c7d4..e077b7e 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -426,6 +426,10 @@
     <path name="primary-playback -> bt" />
   </path>
 
+  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -498,6 +502,10 @@
     <path name="raw-playback -> bt" />
   </path>
 
+  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -570,6 +578,10 @@
     <path name="deep-buffer-playback -> bt" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -647,6 +659,10 @@
     <path name="compress-offload-playback -> bt" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -719,6 +735,10 @@
     <path name="mmap-playback -> bt" />
   </path>
 
+  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -803,6 +823,10 @@
     <path name="voip-playback -> bt" />
   </path>
 
+  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -863,6 +887,10 @@
     <path name="immersive-playback -> bt" />
   </path>
 
+  <path name="immersive-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="immersive-playback -> bt" />
+  </path>
+
   <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
@@ -931,6 +959,10 @@
     <path name="spatializer-offload-playback -> bt" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
@@ -1001,6 +1033,10 @@
     <path name="haptic-playback -> bt" />
   </path>
 
+  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1211,6 +1247,10 @@
     <path name="voice-call-downlink-0 -> bt" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
diff --git a/audio/comet/tuning/apmg3/downlink_dock_config.pb b/audio/comet/tuning/apmg3/downlink_dock_config.pb
index 2fdd177..854a48d 100644
Binary files a/audio/comet/tuning/apmg3/downlink_dock_config.pb and b/audio/comet/tuning/apmg3/downlink_dock_config.pb differ
diff --git a/audio/comet/tuning/apmg3/downlink_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_speaker_config.pb
index 522c721..f8cee42 100644
Binary files a/audio/comet/tuning/apmg3/downlink_speaker_config.pb and b/audio/comet/tuning/apmg3/downlink_speaker_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb
index fb82a78..06e4ef5 100644
Binary files a/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb
index a6bb5a4..979a200 100644
Binary files a/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb
index a844b03..64b3d85 100644
Binary files a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index c9c59ab..a6b567f 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -7,6 +7,7 @@ on init && property:ro.vendor.factory=1
 on init
     # eSE streset tool name
     setprop persist.vendor.se.streset libstreset24
+    setprop persist.vendor.nfc.streset libstreset24
 # No se_chip_en for P1.0
 on late-init && property:ro.boot.hardware.revision=PROTO1.0
     setprop persist.vendor.se.reset.chip_en false
diff --git a/device-comet.mk b/device-comet.mk
index 5fc689f..42299bd 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_COMET_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR)
 endif
@@ -518,13 +520,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.thread_dispatcher.enabled=true
 
-# Thread HAL
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-   com.google.comet.hardware.threadnetwork \
-   ThreadNetworkDemoApp
-endif
-
 # Camera concurrent foldable dual front feature support
 PRODUCT_PACKAGES += \
     concurrent_foldable_dual_front_xml
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 63f8273..4d23759 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -18,6 +18,7 @@ gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc
 gnss_device_data_port_chpp_present=1
 GlueLayer_YearOfHW=2023
 scheduling_enabled=1
+ChipCfg_Timemark_Option=1
 ChipCfg_VDR_high_end_Distance = 200
 ChipCfg_VDR_low_end_Distance = 200
 ChipCfg_VDR_high_end_Time = 20
@@ -54,6 +55,12 @@ GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
 Chip_Configuration_mems_data_Configuration=0x25
+AccelSamplingPeriodUs=10000
+MagnSamplingPeriodUs=10000
+GyroSamplingPeriodUs=10000
+PressSamplingPeriodUs=50000
+OrientationSamplingPeriodUs=10000
+StepCounterSamplingPeriodUs=1000000
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -110,6 +117,7 @@ ENABLE_LPP_CP=1
 ENABLE_LPP_UP=0
 ENABLE_LPPE_CP=3
 ENABLE_LPPE_UP=0
+ENABLE_NLP_ALONG_WITH_UBP=0
 ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
@@ -128,7 +136,6 @@ ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 
 GNSS_CARRIER_ID=3
-ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_SSL_METHOD=TLSv1_2
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index b5485f0..7bc7d36 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -53,6 +53,9 @@ gnss_device_data_port_chpp_present=1
 GlueLayer_YearOfHW=2023
 scheduling_enabled=1
 
+# 1pps timemark output: 0: disable 1: enable
+ChipCfg_Timemark_Option=1
+
 # VDR End condition (meter, meter, sec, sec)
 ChipCfg_VDR_high_end_Distance = 200
 ChipCfg_VDR_low_end_Distance = 200
@@ -189,6 +192,12 @@ GlueLayer_MeasCorrCap=7
 # 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE
 # 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE
 Chip_Configuration_mems_data_Configuration=0x25
+AccelSamplingPeriodUs=10000
+MagnSamplingPeriodUs=10000
+GyroSamplingPeriodUs=10000
+PressSamplingPeriodUs=50000
+OrientationSamplingPeriodUs=10000
+StepCounterSamplingPeriodUs=1000000
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -266,6 +275,7 @@ ENABLE_LPP_CP=1
 ENABLE_LPP_UP=0
 ENABLE_LPPE_CP=3
 ENABLE_LPPE_UP=0
+ENABLE_NLP_ALONG_WITH_UBP=0
 ENABLE_NLP_IN_LPPE=1
 ENABLE_NLP_IN_AGNSS=0
 ENABLE_LPP_HA_GAD_SHAPE=0
@@ -284,7 +294,6 @@ ENABLE_NLP_IN_AGNSS=1
 ENABLE_LPP_HA_GAD_SHAPE=1
 # VZW
 GNSS_CARRIER_ID=3
-ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_SSL_METHOD=TLSv1_2