diff --git a/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so b/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so
index c077af9..8e6aa89 100644
Binary files a/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so and b/proprietary/system_ext/lib/com.qualcomm.qti.ant@1.0.so differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so
index 12db8f1..67af0cb 100644
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so and b/proprietary/system_ext/lib64/com.qualcomm.qti.ant@1.0.so differ
diff --git a/proprietary/vendor/bin/adsprpcd b/proprietary/vendor/bin/adsprpcd
index dcc09d2..a2cd87a 100755
Binary files a/proprietary/vendor/bin/adsprpcd and b/proprietary/vendor/bin/adsprpcd differ
diff --git a/proprietary/vendor/bin/cdsprpcd b/proprietary/vendor/bin/cdsprpcd
index c622cee..be459ac 100755
Binary files a/proprietary/vendor/bin/cdsprpcd and b/proprietary/vendor/bin/cdsprpcd differ
diff --git a/proprietary/vendor/bin/dspservice b/proprietary/vendor/bin/dspservice
index a15fe2e..2db0bbb 100755
Binary files a/proprietary/vendor/bin/dspservice and b/proprietary/vendor/bin/dspservice differ
diff --git a/proprietary/vendor/bin/init.qti.qcv.sh b/proprietary/vendor/bin/init.qti.qcv.sh
new file mode 100755
index 0000000..b6891e3
--- /dev/null
+++ b/proprietary/vendor/bin/init.qti.qcv.sh
@@ -0,0 +1,27 @@
+#! /vendor/bin/sh
+#=============================================================================
+# Copyright (c) 2020-21 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#=============================================================================
+
+soc_id=`cat /sys/devices/soc0/soc_id` 2> /dev/null
+
+# Store soc_id in ro.vendor.qti.soc_id
+setprop ro.vendor.qti.soc_id $soc_id
+
+# For chipsets in QCV family, convert soc_id to soc_name
+# and store it in ro.vendor.qti.soc_name.
+if [ "$soc_id" -eq 415 ] || [ "$soc_id" -eq 439 ] || [ "$soc_id" -eq 456 ] ||
+   [ "$soc_id" -eq 501 ] || [ "$soc_id" -eq 502 ]; then
+    setprop ro.vendor.qti.soc_name lahaina
+    setprop ro.vendor.qti.soc_model SM8350
+elif [ "$soc_id" -eq 450 ]; then
+    setprop ro.vendor.qti.soc_name shima
+    setprop ro.vendor.qti.soc_model SM7350
+elif [ "$soc_id" -eq 475 ] || [ "$soc_id" -eq 499 ] ||
+     [ "$soc_id" -eq 497 ] || [ "$soc_id" -eq 498 ] ||
+     [ "$soc_id" -eq 515 ]; then
+    setprop ro.vendor.qti.soc_name yupik
+    setprop ro.vendor.qti.soc_model SM7325
+fi
diff --git a/proprietary/vendor/bin/loadalgo b/proprietary/vendor/bin/loadalgo
index e8e5b4e..4b9c275 100755
Binary files a/proprietary/vendor/bin/loadalgo and b/proprietary/vendor/bin/loadalgo differ
diff --git a/proprietary/vendor/bin/opf-service b/proprietary/vendor/bin/opf-service
deleted file mode 100755
index f7c6ec2..0000000
Binary files a/proprietary/vendor/bin/opf-service and /dev/null differ
diff --git a/proprietary/vendor/bin/thermal-engine b/proprietary/vendor/bin/thermal-engine
old mode 100755
new mode 100644
index 5dba4eb..f40d7d9
Binary files a/proprietary/vendor/bin/thermal-engine and b/proprietary/vendor/bin/thermal-engine differ
diff --git a/proprietary/vendor/etc/init/init.opf.rc b/proprietary/vendor/etc/init/init.opf.rc
deleted file mode 100644
index 8032258..0000000
--- a/proprietary/vendor/etc/init/init.opf.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-on early-init
-    start opf-service
-
-service opf-service /vendor/bin/opf-service
-    disabled
-    user root
-    group root
-    oneshot
diff --git a/proprietary/vendor/etc/init/init.qti.qcv.rc b/proprietary/vendor/etc/init/init.qti.qcv.rc
new file mode 100644
index 0000000..1904162
--- /dev/null
+++ b/proprietary/vendor/etc/init/init.qti.qcv.rc
@@ -0,0 +1,12 @@
+#! /vendor/etc/init
+#=============================================================================
+# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#=============================================================================
+
+on early-init
+    # Set ro.boot.product.vendor.sku to soc_name
+    exec u:r:vendor_qti_init_shell:s0 -- /vendor/bin/init.qti.qcv.sh
+    setprop ro.boot.product.vendor.sku ${ro.vendor.qti.soc_name}
+    setprop ro.soc.model ${ro.vendor.qti.soc_model}
\ No newline at end of file
diff --git a/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy b/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy
index e5b3618..9007c03 100644
--- a/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy
+++ b/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy
@@ -61,3 +61,4 @@ gettid: 1
 setpriority: 1
 prctl: 1
 write: 1
+madvise: 1
diff --git a/proprietary/vendor/lib/libcdsp_default_listener.so b/proprietary/vendor/lib/libcdsp_default_listener.so
index ffb1517..8c11261 100644
Binary files a/proprietary/vendor/lib/libcdsp_default_listener.so and b/proprietary/vendor/lib/libcdsp_default_listener.so differ
diff --git a/proprietary/vendor/lib/libcdsprpc.so b/proprietary/vendor/lib/libcdsprpc.so
index 2147772..eea2b4d 100644
Binary files a/proprietary/vendor/lib/libcdsprpc.so and b/proprietary/vendor/lib/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib/libfastcrc.so b/proprietary/vendor/lib/libfastcrc.so
index 49f41ea..4cfa3ad 100644
Binary files a/proprietary/vendor/lib/libfastcrc.so and b/proprietary/vendor/lib/libfastcrc.so differ
diff --git a/proprietary/vendor/lib/libmdsprpc.so b/proprietary/vendor/lib/libmdsprpc.so
index cb49610..78052d4 100644
Binary files a/proprietary/vendor/lib/libmdsprpc.so and b/proprietary/vendor/lib/libmdsprpc.so differ
diff --git a/proprietary/vendor/lib/libsdsprpc.so b/proprietary/vendor/lib/libsdsprpc.so
index 4197d97..691c950 100644
Binary files a/proprietary/vendor/lib/libsdsprpc.so and b/proprietary/vendor/lib/libsdsprpc.so differ
diff --git a/proprietary/vendor/lib/libsoc_helper.so b/proprietary/vendor/lib/libsoc_helper.so
new file mode 100644
index 0000000..7230497
Binary files /dev/null and b/proprietary/vendor/lib/libsoc_helper.so differ
diff --git a/proprietary/vendor/lib/libsoc_helper_jni.so b/proprietary/vendor/lib/libsoc_helper_jni.so
new file mode 100644
index 0000000..5cb017d
Binary files /dev/null and b/proprietary/vendor/lib/libsoc_helper_jni.so differ
diff --git a/proprietary/vendor/lib/libsysmon_cdsp_skel.so b/proprietary/vendor/lib/libsysmon_cdsp_skel.so
index 04692c1..fd956ce 100644
Binary files a/proprietary/vendor/lib/libsysmon_cdsp_skel.so and b/proprietary/vendor/lib/libsysmon_cdsp_skel.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so
index 8e2f1df..453066b 100644
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so and b/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so differ
diff --git a/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so b/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so
index bf63f2f..da45c62 100644
Binary files a/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so and b/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/libadsp_default_listener.so b/proprietary/vendor/lib64/libadsp_default_listener.so
index 6efa05b..1f2915e 100644
Binary files a/proprietary/vendor/lib64/libadsp_default_listener.so and b/proprietary/vendor/lib64/libadsp_default_listener.so differ
diff --git a/proprietary/vendor/lib64/libcdfw.so b/proprietary/vendor/lib64/libcdfw.so
index 7fd3798..4b98982 100644
Binary files a/proprietary/vendor/lib64/libcdfw.so 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
index a8acd25..2597a09 100644
Binary files a/proprietary/vendor/lib64/libcdfw_remote_api.so and b/proprietary/vendor/lib64/libcdfw_remote_api.so differ
diff --git a/proprietary/vendor/lib64/libcdsp_default_listener.so b/proprietary/vendor/lib64/libcdsp_default_listener.so
index 2a0b492..0a0359f 100644
Binary files a/proprietary/vendor/lib64/libcdsp_default_listener.so and b/proprietary/vendor/lib64/libcdsp_default_listener.so differ
diff --git a/proprietary/vendor/lib64/libcdsprpc.so b/proprietary/vendor/lib64/libcdsprpc.so
index fb1d2ef..1211e6c 100644
Binary files a/proprietary/vendor/lib64/libcdsprpc.so and b/proprietary/vendor/lib64/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libcvp_common.so b/proprietary/vendor/lib64/libcvp_common.so
index 2095501..2225581 100644
Binary files a/proprietary/vendor/lib64/libcvp_common.so and b/proprietary/vendor/lib64/libcvp_common.so differ
diff --git a/proprietary/vendor/lib64/libcvpcpuRev_skel.so b/proprietary/vendor/lib64/libcvpcpuRev_skel.so
index 65fa931..8b6e0ac 100644
Binary files a/proprietary/vendor/lib64/libcvpcpuRev_skel.so and b/proprietary/vendor/lib64/libcvpcpuRev_skel.so differ
diff --git a/proprietary/vendor/lib64/libloadalgo_stub.so b/proprietary/vendor/lib64/libloadalgo_stub.so
index acadb3f..bcae93c 100644
Binary files a/proprietary/vendor/lib64/libloadalgo_stub.so and b/proprietary/vendor/lib64/libloadalgo_stub.so differ
diff --git a/proprietary/vendor/lib64/libmdsprpc.so b/proprietary/vendor/lib64/libmdsprpc.so
index 6ac5ea0..29b1164 100644
Binary files a/proprietary/vendor/lib64/libmdsprpc.so and b/proprietary/vendor/lib64/libmdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libsdsprpc.so b/proprietary/vendor/lib64/libsdsprpc.so
index 8985bf7..810d663 100644
Binary files a/proprietary/vendor/lib64/libsdsprpc.so and b/proprietary/vendor/lib64/libsdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libsoc_helper.so b/proprietary/vendor/lib64/libsoc_helper.so
index 67a0634..50ad39d 100644
Binary files a/proprietary/vendor/lib64/libsoc_helper.so and b/proprietary/vendor/lib64/libsoc_helper.so differ
diff --git a/proprietary/vendor/lib64/libsoc_helper_jni.so b/proprietary/vendor/lib64/libsoc_helper_jni.so
new file mode 100644
index 0000000..f265ae9
Binary files /dev/null and b/proprietary/vendor/lib64/libsoc_helper_jni.so differ
diff --git a/proprietary/vendor/lib64/libsysmon_cdsp_skel.so b/proprietary/vendor/lib64/libsysmon_cdsp_skel.so
index e27a031..116ad43 100644
Binary files a/proprietary/vendor/lib64/libsysmon_cdsp_skel.so and b/proprietary/vendor/lib64/libsysmon_cdsp_skel.so differ
diff --git a/proprietary/vendor/lib64/vendor.oneplus.hardware.hdcpkey@1.0.so b/proprietary/vendor/lib64/vendor.oneplus.hardware.hdcpkey@1.0.so
deleted file mode 100644
index 090bab4..0000000
Binary files a/proprietary/vendor/lib64/vendor.oneplus.hardware.hdcpkey@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.cvp@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.cvp@1.0.so
index c8575ad..836f70a 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.cvp@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.cvp@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so
index 483b33f..875fe98 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so and b/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so differ
diff --git a/sm7250-common-vendor.mk b/sm7250-common-vendor.mk
index 16c7275..1499bba 100644
--- a/sm7250-common-vendor.mk
+++ b/sm7250-common-vendor.mk
@@ -138,6 +138,7 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/imsdatadaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsdatadaemon \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/imsqmidaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsqmidaemon \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/imsrcsd:$(TARGET_COPY_OUT_VENDOR)/bin/imsrcsd \
+    vendor/oneplus/sm7250-common/proprietary/vendor/bin/init.qti.qcv.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.qcv.sh \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/irsc_util:$(TARGET_COPY_OUT_VENDOR)/bin/irsc_util \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/ks:$(TARGET_COPY_OUT_VENDOR)/bin/ks \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/loadalgo:$(TARGET_COPY_OUT_VENDOR)/bin/loadalgo \
@@ -146,7 +147,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/mlid:$(TARGET_COPY_OUT_VENDOR)/bin/mlid \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/msm_irqbalance:$(TARGET_COPY_OUT_VENDOR)/bin/msm_irqbalance \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/netmgrd:$(TARGET_COPY_OUT_VENDOR)/bin/netmgrd \
-    vendor/oneplus/sm7250-common/proprietary/vendor/bin/opf-service:$(TARGET_COPY_OUT_VENDOR)/bin/opf-service \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/pd-mapper:$(TARGET_COPY_OUT_VENDOR)/bin/pd-mapper \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/pm-proxy:$(TARGET_COPY_OUT_VENDOR)/bin/pm-proxy \
     vendor/oneplus/sm7250-common/proprietary/vendor/bin/pm-service:$(TARGET_COPY_OUT_VENDOR)/bin/pm-service \
@@ -231,7 +231,7 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm7250-common/proprietary/vendor/etc/init/imsqmidaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsqmidaemon.rc \
     vendor/oneplus/sm7250-common/proprietary/vendor/etc/init/imsrcsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsrcsd.rc \
     vendor/oneplus/sm7250-common/proprietary/vendor/etc/init/init-qcril-data.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-qcril-data.rc \
-    vendor/oneplus/sm7250-common/proprietary/vendor/etc/init/init.opf.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.opf.rc \
+    vendor/oneplus/sm7250-common/proprietary/vendor/etc/init/init.qti.qcv.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.qcv.rc \
     vendor/oneplus/sm7250-common/proprietary/vendor/etc/init/init.time_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.time_daemon.rc \
     vendor/oneplus/sm7250-common/proprietary/vendor/etc/init/init.vendor.sensors.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.sensors.rc \
     vendor/oneplus/sm7250-common/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
@@ -418,6 +418,8 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib/libscveObjectTracker_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectTracker_stub.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib/libsdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdsprpc.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib/libsmwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsmwrapper.so \
+    vendor/oneplus/sm7250-common/proprietary/vendor/lib/libsoc_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsoc_helper.so \
+    vendor/oneplus/sm7250-common/proprietary/vendor/lib/libsoc_helper_jni.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsoc_helper_jni.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib/libstagefright_soft_ddpdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefright_soft_ddpdec.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib/libstagefrightdolby.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefrightdolby.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib/libswvdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libswvdec.so \
@@ -691,6 +693,7 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/libsnsapi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnsapi.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/libsnsdiaglog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnsdiaglog.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/libsoc_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsoc_helper.so \
+    vendor/oneplus/sm7250-common/proprietary/vendor/lib64/libsoc_helper_jni.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsoc_helper_jni.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/libssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/libssc_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc_default_listener.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/libssd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssd.so \
@@ -734,7 +737,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.dolby.hardware.dms@1.0-impl.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.dolby.hardware.dms@1.0.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/vendor.nxp.eventprocessor@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.nxp.eventprocessor@1.0.so \
-    vendor/oneplus/sm7250-common/proprietary/vendor/lib64/vendor.oneplus.hardware.hdcpkey@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.oneplus.hardware.hdcpkey@1.0.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.0.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.1.so \
     vendor/oneplus/sm7250-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.2.so \
@@ -854,7 +856,6 @@ PRODUCT_PACKAGES += \
     ims \
     qcrilmsgtunnel \
     WfdCommon \
-    WfdCommon \
     com.motorola.motosignature \
     moto-checkin \
     tcmclient \