diff --git a/extract-files.sh b/extract-files.sh
index 7b915a3e..63b16f8d 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -87,6 +87,13 @@ function blob_fixup() {
         patchelf --add-needed camera.sdm660_shim.so "${2}"
         ;;
 
+    vendor/lib64/libril-qc-hal-qmi.so)
+        patchelf --replace-needed "libprotobuf-cpp-full.so" "libprotobuf-cpp-full-v29.so" "${2}"
+        ;;
+
+    vendor/lib64/libwvhidl.so)
+        patchelf --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v29.so" "${2}"
+        ;;
     product/etc/permissions/vendor.qti.hardware.data.connection-V1.{0,1}-java.xml)
         sed -i 's/xml version="2.0"/xml version="1.0"/' "${2}"
 
diff --git a/sdm660.mk b/sdm660.mk
index 82560daa..a9b9ad51 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -570,6 +570,10 @@ PRODUCT_PACKAGES += \
     vndk_package \
     com.android.vndk.current.on_vendor
 
+PRODUCT_COPY_FILES += \
+    prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-full-v29.so \
+    prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-lite-v29.so
+
 # WiFi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \