diff --git a/Android.bp b/Android.bp
index 6994abb..757b849 100644
--- a/Android.bp
+++ b/Android.bp
@@ -447,6 +447,15 @@ dex_import {
 	system_ext_specific: true,
 }
 
+prebuilt_etc_xml {
+	name: "android.hardware.gnss@2.1-service-qti",
+	owner: "xiaomi",
+	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml",
+	filename_from_src: true,
+	sub_dir: "vintf/manifest",
+	soc_specific: true,
+}
+
 prebuilt_etc_xml {
 	name: "manifest_android.hardware.drm@1.2-service.widevine",
 	owner: "xiaomi",
@@ -457,9 +466,9 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "vendor.qti.gnss@3.0-service",
+	name: "vendor.qti.gnss@4.0-service",
 	owner: "xiaomi",
-	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml",
+	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml",
 	filename_from_src: true,
 	sub_dir: "vintf/manifest",
 	soc_specific: true,
diff --git a/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti b/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti
new file mode 100644
index 0000000..40692b1
Binary files /dev/null and b/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti differ
diff --git a/proprietary/vendor/bin/loc_launcher b/proprietary/vendor/bin/loc_launcher
index 9dc092e..7c3c483 100755
Binary files a/proprietary/vendor/bin/loc_launcher and b/proprietary/vendor/bin/loc_launcher differ
diff --git a/proprietary/vendor/bin/lowi-server b/proprietary/vendor/bin/lowi-server
index fae4d0a..ccb415b 100755
Binary files a/proprietary/vendor/bin/lowi-server and b/proprietary/vendor/bin/lowi-server differ
diff --git a/proprietary/vendor/bin/slim_daemon b/proprietary/vendor/bin/slim_daemon
index 09cf671..7ad2fe7 100755
Binary files a/proprietary/vendor/bin/slim_daemon and b/proprietary/vendor/bin/slim_daemon differ
diff --git a/proprietary/vendor/bin/xtra-daemon b/proprietary/vendor/bin/xtra-daemon
index 8eaa24e..ed8a3ba 100755
Binary files a/proprietary/vendor/bin/xtra-daemon and b/proprietary/vendor/bin/xtra-daemon differ
diff --git a/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc
new file mode 100644
index 0000000..19e32c4
--- /dev/null
+++ b/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc
@@ -0,0 +1,4 @@
+service gnss_service /vendor/bin/hw/android.hardware.gnss@2.1-service-qti
+    class hal
+    user gps
+    group system gps radio vendor_qti_diag
diff --git a/proprietary/vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml b/proprietary/vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
new file mode 100644
index 0000000..842fb6e
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
@@ -0,0 +1,36 @@
+<!-- Copyright (c) 2020, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.gnss</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.1::IGnss/default</fqname>
+        <fqname>@2.1::IGnss/default</fqname>
+    </hal>
+</manifest>
+
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml b/proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml
similarity index 84%
rename from proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml
rename to proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml
index cd9a91c..0ec38c5 100644
--- a/proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml
@@ -1,4 +1,4 @@
-<!-- Copyright (c) 2019 Qualcomm Technologies, Inc.
+<!-- Copyright (c) 2020 Qualcomm Technologies, Inc.
 All Rights Reserved.
 Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -9,6 +9,7 @@ Confidential and Proprietary - Qualcomm Technologies, Inc.
         <fqname>@1.2::ILocHidlGnss/gnss_vendor</fqname>
         <fqname>@2.1::ILocHidlGnss/gnss_vendor</fqname>
         <fqname>@3.0::ILocHidlGnss/gnss_vendor</fqname>
+        <fqname>@4.0::ILocHidlGnss/gnss_vendor</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.gnss</name>
diff --git a/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so
new file mode 100644
index 0000000..5e68c59
Binary files /dev/null and b/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.gnss@3.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.gnss@3.0-impl.so
deleted file mode 100644
index a9a7bd6..0000000
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.gnss@3.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so
new file mode 100644
index 0000000..2df637b
Binary files /dev/null and b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so differ
diff --git a/proprietary/vendor/lib64/libbatching.so b/proprietary/vendor/lib64/libbatching.so
new file mode 100644
index 0000000..26e599a
Binary files /dev/null and b/proprietary/vendor/lib64/libbatching.so differ
diff --git a/proprietary/vendor/lib64/libcacertclient.so b/proprietary/vendor/lib64/libcacertclient.so
deleted file mode 100644
index 0c4e368..0000000
Binary files a/proprietary/vendor/lib64/libcacertclient.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libcdfw.so b/proprietary/vendor/lib64/libcdfw.so
new file mode 100644
index 0000000..f7dccc5
Binary files /dev/null and b/proprietary/vendor/lib64/libcdfw.so differ
diff --git a/proprietary/vendor/lib64/libcdfw_remote_api.so b/proprietary/vendor/lib64/libcdfw_remote_api.so
new file mode 100644
index 0000000..6fd2bdb
Binary files /dev/null and b/proprietary/vendor/lib64/libcdfw_remote_api.so differ
diff --git a/proprietary/vendor/lib64/libdataitems.so b/proprietary/vendor/lib64/libdataitems.so
index 7612749..dcf8b29 100644
Binary files a/proprietary/vendor/lib64/libdataitems.so and b/proprietary/vendor/lib64/libdataitems.so differ
diff --git a/proprietary/vendor/lib64/libgdtap.so b/proprietary/vendor/lib64/libgdtap.so
index ace30e5..91e117a 100644
Binary files a/proprietary/vendor/lib64/libgdtap.so and b/proprietary/vendor/lib64/libgdtap.so differ
diff --git a/proprietary/vendor/lib64/libgeofencing.so b/proprietary/vendor/lib64/libgeofencing.so
new file mode 100644
index 0000000..4bbc77d
Binary files /dev/null and b/proprietary/vendor/lib64/libgeofencing.so differ
diff --git a/proprietary/vendor/lib64/libgnss.so b/proprietary/vendor/lib64/libgnss.so
new file mode 100644
index 0000000..e1cf6d7
Binary files /dev/null and b/proprietary/vendor/lib64/libgnss.so differ
diff --git a/proprietary/vendor/lib64/libgnsspps.so b/proprietary/vendor/lib64/libgnsspps.so
new file mode 100644
index 0000000..a3b50bb
Binary files /dev/null and b/proprietary/vendor/lib64/libgnsspps.so differ
diff --git a/proprietary/vendor/lib64/libgps.utils.so b/proprietary/vendor/lib64/libgps.utils.so
new file mode 100644
index 0000000..eda0214
Binary files /dev/null and b/proprietary/vendor/lib64/libgps.utils.so differ
diff --git a/proprietary/vendor/lib64/libizat_client_api.so b/proprietary/vendor/lib64/libizat_client_api.so
index 5786bd8..9226c59 100644
Binary files a/proprietary/vendor/lib64/libizat_client_api.so and b/proprietary/vendor/lib64/libizat_client_api.so differ
diff --git a/proprietary/vendor/lib64/libizat_core.so b/proprietary/vendor/lib64/libizat_core.so
index 1ab056b..3d5f195 100644
Binary files a/proprietary/vendor/lib64/libizat_core.so and b/proprietary/vendor/lib64/libizat_core.so differ
diff --git a/proprietary/vendor/lib64/liblbs_core.so b/proprietary/vendor/lib64/liblbs_core.so
index 5f69ff0..6c95e1e 100644
Binary files a/proprietary/vendor/lib64/liblbs_core.so and b/proprietary/vendor/lib64/liblbs_core.so differ
diff --git a/proprietary/vendor/lib64/libloc_api_v02.so b/proprietary/vendor/lib64/libloc_api_v02.so
index 7be4004..6ad1021 100644
Binary files a/proprietary/vendor/lib64/libloc_api_v02.so and b/proprietary/vendor/lib64/libloc_api_v02.so differ
diff --git a/proprietary/vendor/lib64/libloc_core.so b/proprietary/vendor/lib64/libloc_core.so
new file mode 100644
index 0000000..520da36
Binary files /dev/null and b/proprietary/vendor/lib64/libloc_core.so differ
diff --git a/proprietary/vendor/lib64/libloc_socket.so b/proprietary/vendor/lib64/libloc_socket.so
new file mode 100644
index 0000000..f3b463f
Binary files /dev/null and b/proprietary/vendor/lib64/libloc_socket.so differ
diff --git a/proprietary/vendor/lib64/liblocation_api.so b/proprietary/vendor/lib64/liblocation_api.so
new file mode 100644
index 0000000..181f15d
Binary files /dev/null and b/proprietary/vendor/lib64/liblocation_api.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice.so b/proprietary/vendor/lib64/liblocationservice.so
index a51711a..0d58ca2 100644
Binary files a/proprietary/vendor/lib64/liblocationservice.so and b/proprietary/vendor/lib64/liblocationservice.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice_glue.so b/proprietary/vendor/lib64/liblocationservice_glue.so
index 1805950..504d0bc 100644
Binary files a/proprietary/vendor/lib64/liblocationservice_glue.so and b/proprietary/vendor/lib64/liblocationservice_glue.so differ
diff --git a/proprietary/vendor/lib64/liblowi_client.so b/proprietary/vendor/lib64/liblowi_client.so
index 98ef23c..12d4043 100644
Binary files a/proprietary/vendor/lib64/liblowi_client.so and b/proprietary/vendor/lib64/liblowi_client.so differ
diff --git a/proprietary/vendor/lib64/liblowi_wifihal.so b/proprietary/vendor/lib64/liblowi_wifihal.so
index 80fa5e1..444c585 100644
Binary files a/proprietary/vendor/lib64/liblowi_wifihal.so and b/proprietary/vendor/lib64/liblowi_wifihal.so differ
diff --git a/proprietary/vendor/lib64/libqcc_file_agent.so b/proprietary/vendor/lib64/libqcc_file_agent.so
new file mode 100644
index 0000000..a24baa6
Binary files /dev/null and b/proprietary/vendor/lib64/libqcc_file_agent.so differ
diff --git a/proprietary/vendor/lib64/libqdma_file_agent.so b/proprietary/vendor/lib64/libqdma_file_agent.so
deleted file mode 100644
index 110ee9f..0000000
Binary files a/proprietary/vendor/lib64/libqdma_file_agent.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libslimclient.so b/proprietary/vendor/lib64/libslimclient.so
index 80fa4d9..e8c61e3 100644
Binary files a/proprietary/vendor/lib64/libslimclient.so and b/proprietary/vendor/lib64/libslimclient.so differ
diff --git a/proprietary/vendor/lib64/libxtadapter.so b/proprietary/vendor/lib64/libxtadapter.so
index 722c556..dc22ead 100644
Binary files a/proprietary/vendor/lib64/libxtadapter.so and b/proprietary/vendor/lib64/libxtadapter.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so b/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so
index c19be3c..a896d3d 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so and b/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so b/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so
index 18bcb05..a952917 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so and b/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so b/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so
index 3c75728..15b5975 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so and b/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so b/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so
index 7a92e7b..125a7d9 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so and b/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so b/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so
index 2fb72af..f6daa11 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so and b/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so b/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so
index 2f1c469..a128eb1 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so and b/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so b/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so
new file mode 100644
index 0000000..15b1f94
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so b/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so
new file mode 100644
index 0000000..85ee8ce
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so
deleted file mode 100644
index ca1aeb7..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so and /dev/null differ
diff --git a/sdm660-common-vendor.mk b/sdm660-common-vendor.mk
index 62e6692..d10f56a 100644
--- a/sdm660-common-vendor.mk
+++ b/sdm660-common-vendor.mk
@@ -166,6 +166,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hw/android.hardware.drm@1.2-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.2-service.widevine \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gnss@2.1-service-qti \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hw/vendor.display.color@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.display.color@1.0-service \
     vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.esepowermanager@1.0-service \
@@ -234,6 +235,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.2-service.widevine.rc \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc \
     vendor/xiaomi/sdm660-common/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
@@ -485,9 +487,10 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_esx.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/activity_recognition.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/activity_recognition.sdm660.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gnss@2.1-impl-qti.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so \
-    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@3.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@3.0-impl.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@4.0-impl.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
@@ -542,11 +545,13 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libaudcal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaudcal.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libaudioalsa.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaudioalsa.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libaudioparsers.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaudioparsers.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libbatching.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbatching.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libbccQTI.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbccQTI.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libbt-hidlclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbt-hidlclient.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libbtnv.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbtnv.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libc2d30_bltlib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc2d30_bltlib.so \
-    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libcacertclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcacertclient.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libcdfw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdfw.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libcdfw_remote_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdfw_remote_api.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libcdsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsp_default_listener.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libcdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsprpc.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libcne.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcne.so \
@@ -568,6 +573,10 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libfastcvopt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfastcvopt.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libfastrpc_utf_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfastrpc_utf_stub.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libgdtap.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgdtap.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libgeofencing.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgeofencing.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libgnss.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgnss.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libgnsspps.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgnsspps.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libgps.utils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgps.utils.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libgsl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgsl.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libhdcpsrm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhdcpsrm.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libhdr_tm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhdr_tm.so \
@@ -581,6 +590,9 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libllvm-glnext.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libllvm-glnext.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libllvm-qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libllvm-qcom.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libloc_api_v02.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_api_v02.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libloc_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_core.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libloc_socket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_socket.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/liblocation_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocation_api.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/liblocationservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocationservice.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/liblocationservice_glue.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocationservice_glue.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/liblowi_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblowi_client.so \
@@ -602,11 +614,11 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdmapper.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdnotifier.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperipheral_client.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqcc_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcc_file_agent.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqcci_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcci_legacy.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcmaputils.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqcrilFramework.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrilFramework.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdi.so \
-    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdma_file_agent.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdp.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqisl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqisl.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi.so \
@@ -678,12 +690,12 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.2.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@2.0.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@2.1.so \
-    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@3.0-service.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@3.0-service.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@3.0.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@4.0-service.so \
+    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@4.0.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.alarm@1.0.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.btconfigstore@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.btconfigstore@1.0.so \
-    vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.cacert@1.0.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so \
     vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so \
@@ -787,6 +799,7 @@ PRODUCT_PACKAGES += \
     com.android.hotwordenrollment.common.util \
     com.qti.dpmframework \
     qti-telephony-common \
+    android.hardware.gnss@2.1-service-qti \
     manifest_android.hardware.drm@1.2-service.widevine \
-    vendor.qti.gnss@3.0-service \
+    vendor.qti.gnss@4.0-service \
     chargeonlymode