diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt
index 9abe222..1e0955f 100644
--- a/configs/public.libraries.txt
+++ b/configs/public.libraries.txt
@@ -1,6 +1,5 @@
 libadsprpc.so
 libOpenCL.so
-libprotobuf-cpp-full.so
 libprotobuf-cpp-lite.so
 libqti-perfd-client.so
 libsdsprpc.so
diff --git a/device.mk b/device.mk
index ce0bd9e..99dd280 100644
--- a/device.mk
+++ b/device.mk
@@ -54,7 +54,8 @@ PRODUCT_PACKAGES += \
 
 # ANT+
 PRODUCT_PACKAGES += \
-    AntHalService
+    AntHalService-Soong \
+    com.dsi.ant@1.0.vendor
 
 # Bluetooth
 PRODUCT_PACKAGES += \
@@ -62,7 +63,8 @@ PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0 \
     android.hardware.bluetooth@1.0.vendor \
     audio.bluetooth.default \
-    vendor.qti.hardware.btconfigstore@1.0.vendor
+    vendor.qti.hardware.btconfigstore@1.0.vendor \
+    vendor.qti.hardware.btconfigstore@2.0.vendor
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 1920
@@ -75,7 +77,7 @@ PRODUCT_PACKAGES += \
     android.hardware.camera.device@3.5:64 \
     android.hardware.camera.provider@2.4-impl:32 \
     android.hardware.camera.provider@2.4-service \
-    android.hardware.camera.provider@2.5:64 \
+    android.hardware.camera.provider@2.6:64 \
     libcamera_shim \
     libpiex_shim \
     vendor.qti.hardware.camera.device@1.0:64
diff --git a/manifest.xml b/manifest.xml
index 4cbac47..5ca2428 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -121,9 +121,9 @@
         <fqname>@1.0::IFingerprintSensorTest/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>com.qualcomm.qti.ant</name>
+        <name>com.dsi.ant</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IAntHci/default</fqname>
+        <fqname>@1.0::IAnt/default</fqname>
     </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.dpm.api</name>
@@ -133,12 +133,12 @@
     <hal format="hidl">
         <name>com.qualcomm.qti.imscmservice</name>
         <transport>hwbinder</transport>
-        <fqname>@2.0::IImsCmService/qti.ims.connectionmanagerservice</fqname>
+        <fqname>@2.2::IImsCmService/qti.ims.connectionmanagerservice</fqname>
     </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.uceservice</name>
         <transport>hwbinder</transport>
-        <fqname>@2.0::IUceService/com.qualcomm.qti.uceservice</fqname>
+        <fqname>@2.3::IUceService/com.qualcomm.qti.uceservice</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.display.config</name>
@@ -169,12 +169,12 @@
     <hal format="hidl">
         <name>vendor.qti.hardware.bluetooth_sar</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IBluetoothSar/default</fqname>
+        <fqname>@1.1::IBluetoothSar/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.btconfigstore</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::IBTConfigStore/default</fqname>
+        <fqname>@2.0::IBTConfigStore/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.data.latency</name>
@@ -256,6 +256,16 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::ITuiComm/default</fqname>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.ims.callinfo</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.0::IService/default</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.ims.factory</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.1::IImsFactory/default</fqname>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.imsrtpservice</name>
         <transport>hwbinder</transport>
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 7fb5e90..35575ba 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -179,6 +179,7 @@ on boot
     # Start qcrild services
     start vendor.qcrild
     start vendor.qcrild2
+    start vendor.dataqti
 
 service vendor.atfwd /vendor/bin/ATFWD-daemon
     class late_start
diff --git a/sepolicy/vendor/ipacm.te b/sepolicy/vendor/ipacm.te
deleted file mode 100644
index 63faf72..0000000
--- a/sepolicy/vendor/ipacm.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow ipacm ipacm_socket:sock_file write;
-allow ipacm ipacm-diag:unix_dgram_socket sendto;
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 867c68a..6646f85 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -1,3 +1,6 @@
+# Bluetooth
+persist.vendor.bt.address u:object_r:vendor_bluetooth_prop:s0
+
 # Camera
 camera.boke. u:object_r:camera_prop:s0
 camera.cts. u:object_r:camera_prop:s0
diff --git a/vendor.prop b/vendor.prop
index 6fd531f..534de57 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -120,7 +120,7 @@ bluetooth.profile.pan.panu.enabled?=true
 bluetooth.profile.pbap.server.enabled?=true
 bluetooth.profile.sap.server.enabled?=true
 persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
-vendor.qcom.bluetooth.soc=cherokee
+persist.vendor.qcom.bluetooth.soc=cherokee
 
 # Camera
 persist.camera.stats.test=5
@@ -162,6 +162,7 @@ debug.stagefright.omx_default_rank=0
 
 # Network manager
 persist.vendor.data.iwlan.enable=true
+persist.vendor.data.mode=concurrent
 
 # Perf
 ro.vendor.extension_library=libqti-perfd-client.so
@@ -172,7 +173,6 @@ persist.radio.multisim.config=dsds
 persist.vendor.data.mode=concurrent
 persist.vendor.radio.apm_sim_not_pwdn=1
 persist.vendor.radio.custom_ecc=1
-persist.vendor.radio.enableadvancedscan=false
 persist.vendor.radio.force_on_dc=true
 persist.vendor.radio.mt_sms_ack=30
 persist.vendor.radio.rat_on=combine