diff --git a/device.mk b/device.mk
index 5a70383..6296c8d 100644
--- a/device.mk
+++ b/device.mk
@@ -42,6 +42,12 @@ include device/peter/gsi/quirks/quirks.mk
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml
 
+PRODUCT_PACKAGES += \
+    OpenEUICC
+
+# vendor/foss
+PRODUCT_PACKAGES += \
+    UnifiedNlp
 
 # Enable ro.adb.secure on userdebug and user
 ifeq (,$(filter eng,$(TARGET_BUILD_VARIANT)))
diff --git a/init/init_gsi.cpp b/init/init_gsi.cpp
index c910fb7..f566245 100644
--- a/init/init_gsi.cpp
+++ b/init/init_gsi.cpp
@@ -40,8 +40,6 @@ void handle_device_model_props() {
     string brand = base::GetProperty("ro.product.vendor.brand", "");
     string manufacturer = base::GetProperty("ro.product.vendor.manufacturer", "");
     string fingerprint = base::GetProperty("ro.vendor.build.fingerprint", "");
-    string spl = base::GetProperty("ro.vendor.build.security_patch", "");
-    string spl_orig = base::GetProperty("ro.build.version.security_patch", "");
     
     for (const auto& source : RO_PROP_SOURCES) {
         override_ro_prop("ro.product", source, "device", device);
@@ -54,8 +52,6 @@ void handle_device_model_props() {
     override_ro_prop("ro", "", "build.stock_fingerprint", fingerprint);
     override_ro_prop("ro", "", "build.flavor", name + "-user");
     override_ro_prop("ro", "", "build.tags", "release-keys");
-    override_ro_prop("ro", "", "build.version.security_patch", spl);
-    override_ro_prop("ro", "", "build.version.real_security_patch", spl_orig);
 }
 
 int main(int argc, char **argv) {
diff --git a/init/quirks/soc/caf_audio.cpp b/init/quirks/soc/caf_audio.cpp
index 3f95130..89a31ae 100644
--- a/init/quirks/soc/caf_audio.cpp
+++ b/init/quirks/soc/caf_audio.cpp
@@ -1,5 +1,7 @@
 #include "../../quirks.h"
 
+#include <android-base/properties.h>
+
 #include <filesystem>
 
 using namespace std;
@@ -15,6 +17,10 @@ public:
         if (filesystem::exists("/vendor/etc/a2dp_audio_policy_configuration.xml")) {
             Quirks::OverrideFileReplaceSubstr("/vendor/etc/a2dp_audio_policy_configuration.xml", "bluetooth_qti", "a2dp");
         }
+
+        // Disable A2DP offload on qcom
+        android::base::SetProperty("persist.bluetooth.a2dp_offload.disabled", "true");
+        android::base::SetProperty("persist.bluetooth.bluetooth_audio_hal.disabled", "true");
     }
 };
 
diff --git a/sepolicy/private/qualcomm.te b/sepolicy/private/qualcomm.te
new file mode 100644
index 0000000..9ccb730
--- /dev/null
+++ b/sepolicy/private/qualcomm.te
@@ -0,0 +1,5 @@
+type vendor_qmipriod, domain;
+type vendor_qmipriod_data_file, file_type, data_file_type;
+
+r_dir_file(vendor_qmipriod, vendor_qmipriod_data_file);
+allow vendor_qmipriod vendor_qmipriod_data_file:file w_file_perms;