diff --git a/marmite/Android.bp b/marmite/Android.bp
index e5eac7ca..7b2905cc 100644
--- a/marmite/Android.bp
+++ b/marmite/Android.bp
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2019-2020 The LineageOS Project
+ * Copyright (C) 2019-2020 The PixelExperience Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,106 +87,110 @@ android_app_import {
 }
 
 android_app_import {
-	name: "datastatusnotification",
+	name: "WfdService",
 	owner: "wileyfox",
-	apk: "proprietary/app/datastatusnotification/datastatusnotification.apk",
+	apk: "proprietary/priv-app/WfdService/WfdService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
+	privileged: true,
 }
 
 android_app_import {
-	name: "uceShimService",
+	name: "CneApp",
 	owner: "wileyfox",
-	apk: "proprietary/app/uceShimService/uceShimService.apk",
+	apk: "proprietary/vendor/app/CneApp/CneApp.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
+	soc_specific: true,
 }
 
 android_app_import {
-	name: "WfdService",
+	name: "IWlanService",
 	owner: "wileyfox",
-	apk: "proprietary/priv-app/WfdService/WfdService.apk",
+	apk: "proprietary/vendor/app/IWlanService/IWlanService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
+	soc_specific: true,
 }
 
 android_app_import {
-	name: "ims",
+	name: "PowerOffAlarm",
 	owner: "wileyfox",
-	apk: "proprietary/priv-app/ims/ims.apk",
+	apk: "proprietary/vendor/app/PowerOffAlarm/PowerOffAlarm.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
+	soc_specific: true,
 }
 
 android_app_import {
-	name: "qcrilmsgtunnel",
+	name: "TimeService",
 	owner: "wileyfox",
-	apk: "proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
-	certificate: "platform",
+	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
+	certificate: ":timeservice_app_cert-legacy-um",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
+	soc_specific: true,
 }
 
 android_app_import {
-	name: "CneApp",
+	name: "imssettings",
 	owner: "wileyfox",
-	apk: "proprietary/vendor/app/CneApp/CneApp.apk",
+	apk: "proprietary/product/app/imssettings/imssettings.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	soc_specific: true,
+	product_specific: true,
 }
 
 android_app_import {
-	name: "IWlanService",
+	name: "uceShimService",
 	owner: "wileyfox",
-	apk: "proprietary/vendor/app/IWlanService/IWlanService.apk",
+	apk: "proprietary/product/app/uceShimService/uceShimService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	soc_specific: true,
+	product_specific: true,
 }
 
 android_app_import {
-	name: "PowerOffAlarm",
+	name: "dpmserviceapp",
 	owner: "wileyfox",
-	apk: "proprietary/vendor/app/PowerOffAlarm/PowerOffAlarm.apk",
+	apk: "proprietary/product/priv-app/dpmserviceapp/dpmserviceapp.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	soc_specific: true,
+	privileged: true,
+	product_specific: true,
 }
 
 android_app_import {
-	name: "TimeService",
+	name: "ims",
 	owner: "wileyfox",
-	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
-	certificate: ":timeservice_app_cert-legacy-um",
+	apk: "proprietary/product/priv-app/ims/ims.apk",
+	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	soc_specific: true,
+	privileged: true,
+	product_specific: true,
 }
 
 android_app_import {
-	name: "dpmserviceapp",
+	name: "qcrilmsgtunnel",
 	owner: "wileyfox",
-	apk: "proprietary/product/priv-app/dpmserviceapp/dpmserviceapp.apk",
+	apk: "proprietary/product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -194,12 +199,42 @@ android_app_import {
 	product_specific: true,
 }
 
+dex_import {
+	name: "QtiTelephonyServicelibrary",
+	owner: "wileyfox",
+	jars: ["proprietary/framework/QtiTelephonyServicelibrary.jar"],
+}
+
 dex_import {
 	name: "WfdCommon",
 	owner: "wileyfox",
 	jars: ["proprietary/framework/WfdCommon.jar"],
 }
 
+dex_import {
+	name: "embmslibrary",
+	owner: "wileyfox",
+	jars: ["proprietary/framework/embmslibrary.jar"],
+}
+
+dex_import {
+	name: "qcrilhook",
+	owner: "wileyfox",
+	jars: ["proprietary/framework/qcrilhook.jar"],
+}
+
+dex_import {
+	name: "uimlpalibrary",
+	owner: "wileyfox",
+	jars: ["proprietary/framework/uimlpalibrary.jar"],
+}
+
+dex_import {
+	name: "uimremotesimlocklibrary",
+	owner: "wileyfox",
+	jars: ["proprietary/framework/uimremotesimlocklibrary.jar"],
+}
+
 cc_prebuilt_library_shared {
 	name: "libjpegehw",
 	owner: "wileyfox",
diff --git a/marmite/Android.mk b/marmite/Android.mk
index c519e7de..092cd326 100644
--- a/marmite/Android.mk
+++ b/marmite/Android.mk
@@ -1,5 +1,6 @@
 # Copyright (C) 2016 The CyanogenMod Project
 # Copyright (C) 2017-2020 The LineageOS Project
+# Copyright (C) 2017-2020 The PixelExperience Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/marmite/BoardConfigVendor.mk b/marmite/BoardConfigVendor.mk
index ff578625..3f91b956 100644
--- a/marmite/BoardConfigVendor.mk
+++ b/marmite/BoardConfigVendor.mk
@@ -1,5 +1,6 @@
 # Copyright (C) 2016 The CyanogenMod Project
 # Copyright (C) 2017-2020 The LineageOS Project
+# Copyright (C) 2017-2020 The PixelExperience Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/marmite/marmite-vendor.mk b/marmite/marmite-vendor.mk
index 4ab7c039..721adc5d 100644
--- a/marmite/marmite-vendor.mk
+++ b/marmite/marmite-vendor.mk
@@ -1,5 +1,6 @@
 # Copyright (C) 2016 The CyanogenMod Project
 # Copyright (C) 2017-2020 The LineageOS Project
+# Copyright (C) 2017-2020 The PixelExperience Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,22 +25,23 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/etc/cne/Nexus/ROW/ROW_profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/Nexus/ROW/ROW_profiles.xml \
     vendor/wileyfox/marmite/proprietary/etc/cne/Nexus/VZW/VZW_profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/cne/Nexus/VZW/VZW_profiles.xml \
     vendor/wileyfox/marmite/proprietary/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/wfdservice.rc \
+    vendor/wileyfox/marmite/proprietary/etc/permissions/lpa.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/lpa.xml \
     vendor/wileyfox/marmite/proprietary/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qcrilhook.xml \
-    vendor/wileyfox/marmite/proprietary/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qti_libpermissions.xml \
     vendor/wileyfox/marmite/proprietary/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/qti_permissions.xml \
+    vendor/wileyfox/marmite/proprietary/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/telephonyservice.xml \
     vendor/wileyfox/marmite/proprietary/etc/wfdconfig.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfig.xml \
     vendor/wileyfox/marmite/proprietary/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfigsink.xml \
-    vendor/wileyfox/marmite/proprietary/framework/qcrilhook.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/qcrilhook.jar \
-    vendor/wileyfox/marmite/proprietary/framework/qti-telephony-common.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/qti-telephony-common.jar \
     vendor/wileyfox/marmite/proprietary/lib/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib/com.qualcomm.qti.ant@1.0.so \
     vendor/wileyfox/marmite/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
     vendor/wileyfox/marmite/proprietary/lib/extractors/libmmparserextractor.so:$(TARGET_COPY_OUT_SYSTEM)/lib/extractors/libmmparserextractor.so \
     vendor/wileyfox/marmite/proprietary/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \
     vendor/wileyfox/marmite/proprietary/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \
+    vendor/wileyfox/marmite/proprietary/lib/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libdiag_system.so \
     vendor/wileyfox/marmite/proprietary/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmosal.so \
     vendor/wileyfox/marmite/proprietary/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmparser_lite.so \
     vendor/wileyfox/marmite/proprietary/lib/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmrtpdecoder.so \
     vendor/wileyfox/marmite/proprietary/lib/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmrtpencoder.so \
+    vendor/wileyfox/marmite/proprietary/lib/libqmi_cci_system.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libqmi_cci_system.so \
     vendor/wileyfox/marmite/proprietary/lib/libwfdavenhancements.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdavenhancements.so \
     vendor/wileyfox/marmite/proprietary/lib/libwfdcodecv4l2.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdcodecv4l2.so \
     vendor/wileyfox/marmite/proprietary/lib/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdcommonutils.so \
@@ -56,37 +58,44 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrc.so \
     vendor/wileyfox/marmite/proprietary/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrcinterface.so \
     vendor/wileyfox/marmite/proprietary/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/com.qualcomm.qti.ant@1.0.so \
-    vendor/wileyfox/marmite/proprietary/lib64/lib-imscamera.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imscamera.so \
-    vendor/wileyfox/marmite/proprietary/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvideocodec.so \
-    vendor/wileyfox/marmite/proprietary/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvt.so \
-    vendor/wileyfox/marmite/proprietary/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvtextutils.so \
-    vendor/wileyfox/marmite/proprietary/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imsvtutils.so \
     vendor/wileyfox/marmite/proprietary/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libdiag_system.so \
-    vendor/wileyfox/marmite/proprietary/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libimscamera_jni.so \
-    vendor/wileyfox/marmite/proprietary/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libimsmedia_jni.so \
     vendor/wileyfox/marmite/proprietary/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmmosal.so \
-    vendor/wileyfox/marmite/proprietary/lib64/librcc.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/librcc.so \
+    vendor/wileyfox/marmite/proprietary/lib64/libqmi_cci_system.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libqmi_cci_system.so \
     vendor/wileyfox/marmite/proprietary/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdclient.so \
     vendor/wileyfox/marmite/proprietary/lib64/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdnative.so \
-    vendor/wileyfox/marmite/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.imsrtpservice@1.0.so \
     vendor/wileyfox/marmite/proprietary/product/bin/dpmd:$(TARGET_COPY_OUT_PRODUCT)/bin/dpmd \
     vendor/wileyfox/marmite/proprietary/product/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/dpm/dpm.conf \
     vendor/wileyfox/marmite/proprietary/product/etc/init/dpmd.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/dpmd.rc \
     vendor/wileyfox/marmite/proprietary/product/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.qti.dpmframework.xml \
     vendor/wileyfox/marmite/proprietary/product/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/dpmapi.xml \
+    vendor/wileyfox/marmite/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/telephony_product_privapp-permissions-qti.xml \
     vendor/wileyfox/marmite/proprietary/product/framework/com.qti.dpmframework.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/com.qti.dpmframework.jar \
     vendor/wileyfox/marmite/proprietary/product/framework/dpmapi.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/dpmapi.jar \
+    vendor/wileyfox/marmite/proprietary/product/framework/qti-telephony-common.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/qti-telephony-common.jar \
     vendor/wileyfox/marmite/proprietary/product/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/com.quicinc.cne.api@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.api@1.0.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/com.quicinc.cne.api@1.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.api@1.1.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/com.quicinc.cne.constants@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@1.0.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/com.quicinc.cne.constants@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@2.0.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/com.quicinc.cne.constants@2.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.quicinc.cne.constants@2.1.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/lib-imscamera.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/lib-imscamera.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/lib-imsvideocodec.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/lib-imsvt.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/lib-imsvtextutils.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/lib-imsvtutils.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmctmgr.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmfdmgr.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/libdpmframework.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmframework.so \
     vendor/wileyfox/marmite/proprietary/product/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmtcm.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libimscamera_jni.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libimsmedia_jni.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/vendor.qti.ims.callinfo@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.ims.callinfo@1.0.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/vendor.qti.ims.rcsconfig@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.ims.rcsconfig@1.0.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/vendor.qti.ims.rcsconfig@1.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.ims.rcsconfig@1.1.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/vendor.qti.imsrtpservice@2.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.imsrtpservice@2.0.so \
+    vendor/wileyfox/marmite/proprietary/product/lib64/vendor.qti.imsrtpservice@2.1.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.imsrtpservice@2.1.so \
     vendor/wileyfox/marmite/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
+    vendor/wileyfox/marmite/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
     vendor/wileyfox/marmite/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
     vendor/wileyfox/marmite/proprietary/vendor/bin/cnd:$(TARGET_COPY_OUT_VENDOR)/bin/cnd \
     vendor/wileyfox/marmite/proprietary/vendor/bin/cnss-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/cnss-daemon \
@@ -95,6 +104,7 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \
     vendor/wileyfox/marmite/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/wileyfox/marmite/proprietary/vendor/bin/hw/android.hardware.drm@1.1-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.1-service.widevine \
+    vendor/wileyfox/marmite/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
     vendor/wileyfox/marmite/proprietary/vendor/bin/hw/vendor.qti.gnss@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.gnss@1.0-service \
     vendor/wileyfox/marmite/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.alarm@1.0-service \
     vendor/wileyfox/marmite/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@1.0-service \
@@ -102,6 +112,7 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/bin/imsdatadaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsdatadaemon \
     vendor/wileyfox/marmite/proprietary/vendor/bin/imsqmidaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsqmidaemon \
     vendor/wileyfox/marmite/proprietary/vendor/bin/imsrcsd:$(TARGET_COPY_OUT_VENDOR)/bin/imsrcsd \
+    vendor/wileyfox/marmite/proprietary/vendor/bin/ipacm-diag:$(TARGET_COPY_OUT_VENDOR)/bin/ipacm-diag \
     vendor/wileyfox/marmite/proprietary/vendor/bin/irsc_util:$(TARGET_COPY_OUT_VENDOR)/bin/irsc_util \
     vendor/wileyfox/marmite/proprietary/vendor/bin/loc_launcher:$(TARGET_COPY_OUT_VENDOR)/bin/loc_launcher \
     vendor/wileyfox/marmite/proprietary/vendor/bin/lowi-server:$(TARGET_COPY_OUT_VENDOR)/bin/lowi-server \
@@ -109,6 +120,7 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/bin/netmgrd:$(TARGET_COPY_OUT_VENDOR)/bin/netmgrd \
     vendor/wileyfox/marmite/proprietary/vendor/bin/pm-proxy:$(TARGET_COPY_OUT_VENDOR)/bin/pm-proxy \
     vendor/wileyfox/marmite/proprietary/vendor/bin/pm-service:$(TARGET_COPY_OUT_VENDOR)/bin/pm-service \
+    vendor/wileyfox/marmite/proprietary/vendor/bin/port-bridge:$(TARGET_COPY_OUT_VENDOR)/bin/port-bridge \
     vendor/wileyfox/marmite/proprietary/vendor/bin/power_off_alarm:$(TARGET_COPY_OUT_VENDOR)/bin/power_off_alarm \
     vendor/wileyfox/marmite/proprietary/vendor/bin/qseecomd:$(TARGET_COPY_OUT_VENDOR)/bin/qseecomd \
     vendor/wileyfox/marmite/proprietary/vendor/bin/qti:$(TARGET_COPY_OUT_VENDOR)/bin/qti \
@@ -153,10 +165,21 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/etc/init/android.hardware.drm@1.1-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.1-service.widevine.rc \
     vendor/wileyfox/marmite/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
     vendor/wileyfox/marmite/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/wileyfox/marmite/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/dataqti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataqti.rc \
     vendor/wileyfox/marmite/proprietary/vendor/etc/init/dpmQmiMgr.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dpmQmiMgr.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/ims_rtp_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ims_rtp_daemon.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/imsdatadaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdatadaemon.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/imsqmidaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsqmidaemon.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/imsrcsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsrcsd.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/port-bridge.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/port-bridge.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
     vendor/wileyfox/marmite/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.gnss@1.0-service.rc \
     vendor/wileyfox/marmite/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
     vendor/wileyfox/marmite/proprietary/vendor/etc/init/vendor.qti.hardware.perf@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@1.0-service.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.rmt_storage.rc \
+    vendor/wileyfox/marmite/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \
     vendor/wileyfox/marmite/proprietary/vendor/etc/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \
     vendor/wileyfox/marmite/proprietary/vendor/etc/perf/perf-profile0.conf:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perf-profile0.conf \
     vendor/wileyfox/marmite/proprietary/vendor/etc/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
@@ -216,6 +239,7 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libaudcal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libaudcal.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libbccQTI.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbccQTI.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libc2d30_bltlib.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc2d30_bltlib.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libconfigdb.so:$(TARGET_COPY_OUT_VENDOR)/lib/libconfigdb.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libdiag.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdiag.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libdsi_netctrl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsi_netctrl.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libdsutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsutils.so \
@@ -227,10 +251,22 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libidl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libidl.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libllvm-glnext.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-glnext.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libllvm-qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-qcom.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/liblqe.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblqe.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdmdetect.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libmmosal_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal_proprietary.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libnetmgr.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libnetmgr_common.so:$(TARGET_COPY_OUT_VENDOR)/lib/libnetmgr_common.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libnetmgr_nr_fusion.so:$(TARGET_COPY_OUT_VENDOR)/lib/libnetmgr_nr_fusion.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libnetmgr_rmnet_ext.so:$(TARGET_COPY_OUT_VENDOR)/lib/libnetmgr_rmnet_ext.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libnlnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libnlnetmgr.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/liboemaids_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib/liboemaids_vendor.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpdmapper.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpdnotifier.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfgluelayer.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperipheral_client.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libqcci_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqcci_legacy.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqcmaputils.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libqcrilFramework.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqcrilFramework.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdi.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdp.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi.so \
@@ -241,9 +277,16 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_csi.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_encdec.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmiservices.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libqrtr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqrtr.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd-client.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-util.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libril-qc-hal-qmi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libril-qc-hal-qmi.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libril-qc-ltedirectdisc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libril-qc-ltedirectdisc.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libril-qc-qmi-1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libril-qc-qmi-1.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libril-qc-radioconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib/libril-qc-radioconfig.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libril-qcril-hook-oem.so:$(TARGET_COPY_OUT_VENDOR)/lib/libril-qcril-hook-oem.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/librilqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/librilqmiservices.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/librs_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/librs_adreno.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/librs_adreno_sha1.so:$(TARGET_COPY_OUT_VENDOR)/lib/librs_adreno_sha1.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libscalar.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscalar.so \
@@ -252,7 +295,9 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libsdmextension.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdmextension.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libsensor1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsensor1.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libsensor_reg.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsensor_reg.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libsettings.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsettings.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libsmwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsmwrapper.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsystem_health_mon.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtinyxml2_1.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpplibrary.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libvqzip.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvqzip.so \
@@ -261,6 +306,7 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libwfdhdcpcp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhdcpcp.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libwfdmmservice.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmmservice.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/libwfdmodulehdcpsession.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmodulehdcpsession.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/qcrild_librilutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/qcrild_librilutils.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/rfsa/adsp/libapps_mem_heap.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libapps_mem_heap.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/rfsa/adsp/libdspCV_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libdspCV_skel.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/rfsa/adsp/libexternal_dog_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libexternal_dog_skel.so \
@@ -272,12 +318,25 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib/soundfx/libqcreverb.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcreverb.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/soundfx/libqcvirt.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcvirt.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.perf@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.perf@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.am@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.am@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.atcmdfwd@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.atcmdfwd@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.lpa@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.lpa@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qcrilhook@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.qcrilhook@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qtiradio@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.qtiradio@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qtiradio@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.qtiradio@2.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.uim@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.uim@1.1.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim_remote_client@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.uim_remote_client@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim_remote_server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.radio.uim_remote_server@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.ant@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.ant@1.0_vendor.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.1.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.2.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.1.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/eglSubDriverAndroid.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libEGL_adreno.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/egl/libGLESv1_CM_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libGLESv1_CM_adreno.so \
@@ -294,17 +353,16 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@1.0-impl.so \
     vendor/wileyfox/marmite/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/wileyfox/marmite/proprietary/vendor/lib64/hw/vulkan.msm8937.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vulkan.msm8937.so \
-    vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-dplmedia.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-dplmedia.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-imsSDP.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsSDP.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-imscmservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imscmservice.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-imsdpl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsdpl.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-imsqimf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsqimf.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-imsrcs-v2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsrcs-v2.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsrcsbaseimpl.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-imsvtcore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsvtcore.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-imsxml.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsxml.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-rtpcommon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpcommon.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-rtpcore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpcore.so \
-    vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-rtpdaemoninterface.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpdaemoninterface.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-rtpsl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpsl.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-siputility.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-siputility.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/lib-uceservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-uceservice.so \
@@ -363,10 +421,17 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdmdetect.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libnetmgr_common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_common.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/libnetmgr_nr_fusion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_nr_fusion.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_rmnet_ext.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libnlnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnlnetmgr.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/liboemaids_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liboemaids_vendor.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdmapper.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdnotifier.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfgluelayer.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperipheral_client.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/libqcci_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcci_legacy.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcmaputils.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/libqcrilFramework.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrilFramework.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdi.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdp.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libqisl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqisl.so \
@@ -383,6 +448,8 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd-client.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-util.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/librcc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librcc.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/libril-qc-hal-qmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-hal-qmi.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-ltedirectdisc.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libril-qc-qmi-1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-qmi-1.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libril-qc-radioconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-radioconfig.so \
@@ -410,6 +477,7 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libxml.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxml.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libxtadapter.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxtadapter.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/libxtwifi_ulp_adaptor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxtwifi_ulp_adaptor.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/qcrild_librilutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qcrild_librilutils.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/sensor_calibrate.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensor_calibrate.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.ssc.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.0.so \
@@ -430,6 +498,12 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.am@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.1.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.2.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.3.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.4.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.5.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.6.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.lpa@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so \
@@ -440,8 +514,10 @@ PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callinfo@1.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.0.so \
-    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so \
-    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@1.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.1.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@2.0.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1-service-Impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@2.1-service-Impl.so \
+    vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@2.1.so \
     vendor/wileyfox/marmite/proprietary/vendor/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.0.so \
     vendor/wileyfox/marmite/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db
 
@@ -450,17 +526,22 @@ PRODUCT_PACKAGES += \
     libsdm-disp-vndapis \
     libthermalclient \
     QtiTelephonyService \
-    datastatusnotification \
-    uceShimService \
     WfdService \
-    ims \
-    qcrilmsgtunnel \
     CneApp \
     IWlanService \
     PowerOffAlarm \
     TimeService \
+    imssettings \
+    uceShimService \
     dpmserviceapp \
-    WfdCommon
+    ims \
+    qcrilmsgtunnel \
+    QtiTelephonyServicelibrary \
+    WfdCommon \
+    embmslibrary \
+    qcrilhook \
+    uimlpalibrary \
+    uimremotesimlocklibrary
 PRODUCT_COPY_FILES += \
     vendor/wileyfox/marmite/proprietary/etc/firmware/ice40.bin:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/ice40.bin \
     vendor/wileyfox/marmite/proprietary/lib/libtrueportrait.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libtrueportrait.so \
diff --git a/marmite/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk b/marmite/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk
index 3b495565..633b39a1 100644
Binary files a/marmite/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk and b/marmite/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk differ
diff --git a/marmite/proprietary/app/datastatusnotification/datastatusnotification.apk b/marmite/proprietary/app/datastatusnotification/datastatusnotification.apk
deleted file mode 100644
index 73769689..00000000
Binary files a/marmite/proprietary/app/datastatusnotification/datastatusnotification.apk and /dev/null differ
diff --git a/marmite/proprietary/app/uceShimService/uceShimService.apk b/marmite/proprietary/app/uceShimService/uceShimService.apk
deleted file mode 100644
index 5ae1967e..00000000
Binary files a/marmite/proprietary/app/uceShimService/uceShimService.apk and /dev/null differ
diff --git a/marmite/proprietary/etc/permissions/lpa.xml b/marmite/proprietary/etc/permissions/lpa.xml
new file mode 100644
index 00000000..bfe73ea7
--- /dev/null
+++ b/marmite/proprietary/etc/permissions/lpa.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2016 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<permissions>
+ <library name="com.qualcomm.qti.lpa.uimlpalibrary"
+          file="/system/framework/uimlpalibrary.jar"/>
+</permissions>
diff --git a/marmite/proprietary/etc/permissions/qti_libpermissions.xml b/marmite/proprietary/etc/permissions/qti_libpermissions.xml
deleted file mode 100644
index 4756f67b..00000000
--- a/marmite/proprietary/etc/permissions/qti_libpermissions.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-    Copyright (c) 2017 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
- -->
-<permissions>
-    <library name="android.hidl.manager@1.0-java"
-          file="/system/framework/android.hidl.manager-V1.0-java.jar"/>
-</permissions>
diff --git a/marmite/proprietary/etc/permissions/telephonyservice.xml b/marmite/proprietary/etc/permissions/telephonyservice.xml
new file mode 100644
index 00000000..2cf6213e
--- /dev/null
+++ b/marmite/proprietary/etc/permissions/telephonyservice.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2014 Qualcomm Technologies, Inc.  All Rights Reserved.
+Qualcomm Technologies Proprietary and Confidential.
+-->
+
+<permissions>
+<library name="com.qualcomm.qti.QtiTelephonyServicelibrary"
+         file="/system/framework/QtiTelephonyServicelibrary.jar"/>
+</permissions>
diff --git a/marmite/proprietary/framework/QtiTelephonyServicelibrary.jar b/marmite/proprietary/framework/QtiTelephonyServicelibrary.jar
new file mode 100644
index 00000000..195cbd7a
Binary files /dev/null and b/marmite/proprietary/framework/QtiTelephonyServicelibrary.jar differ
diff --git a/marmite/proprietary/framework/embmslibrary.jar b/marmite/proprietary/framework/embmslibrary.jar
new file mode 100644
index 00000000..9900384c
Binary files /dev/null and b/marmite/proprietary/framework/embmslibrary.jar differ
diff --git a/marmite/proprietary/framework/qcrilhook.jar b/marmite/proprietary/framework/qcrilhook.jar
index 08035484..06f2a535 100644
Binary files a/marmite/proprietary/framework/qcrilhook.jar and b/marmite/proprietary/framework/qcrilhook.jar differ
diff --git a/marmite/proprietary/framework/qti-telephony-common.jar b/marmite/proprietary/framework/qti-telephony-common.jar
deleted file mode 100644
index 0c84b464..00000000
Binary files a/marmite/proprietary/framework/qti-telephony-common.jar and /dev/null differ
diff --git a/marmite/proprietary/framework/uimlpalibrary.jar b/marmite/proprietary/framework/uimlpalibrary.jar
new file mode 100644
index 00000000..0b1be062
Binary files /dev/null and b/marmite/proprietary/framework/uimlpalibrary.jar differ
diff --git a/marmite/proprietary/framework/uimremotesimlocklibrary.jar b/marmite/proprietary/framework/uimremotesimlocklibrary.jar
new file mode 100644
index 00000000..aa1bee2d
Binary files /dev/null and b/marmite/proprietary/framework/uimremotesimlocklibrary.jar differ
diff --git a/marmite/proprietary/lib/libdiag_system.so b/marmite/proprietary/lib/libdiag_system.so
new file mode 100644
index 00000000..3a5320a3
Binary files /dev/null and b/marmite/proprietary/lib/libdiag_system.so differ
diff --git a/marmite/proprietary/lib/libqmi_cci_system.so b/marmite/proprietary/lib/libqmi_cci_system.so
new file mode 100644
index 00000000..c0df22e3
Binary files /dev/null and b/marmite/proprietary/lib/libqmi_cci_system.so differ
diff --git a/marmite/proprietary/lib64/lib-imscamera.so b/marmite/proprietary/lib64/lib-imscamera.so
deleted file mode 100644
index 71a24414..00000000
Binary files a/marmite/proprietary/lib64/lib-imscamera.so and /dev/null differ
diff --git a/marmite/proprietary/lib64/lib-imsvideocodec.so b/marmite/proprietary/lib64/lib-imsvideocodec.so
deleted file mode 100644
index 37ebaa86..00000000
Binary files a/marmite/proprietary/lib64/lib-imsvideocodec.so and /dev/null differ
diff --git a/marmite/proprietary/lib64/lib-imsvt.so b/marmite/proprietary/lib64/lib-imsvt.so
deleted file mode 100644
index 3a4546b9..00000000
Binary files a/marmite/proprietary/lib64/lib-imsvt.so and /dev/null differ
diff --git a/marmite/proprietary/lib64/libdiag_system.so b/marmite/proprietary/lib64/libdiag_system.so
index 1f72cc29..90c9c70d 100644
Binary files a/marmite/proprietary/lib64/libdiag_system.so and b/marmite/proprietary/lib64/libdiag_system.so differ
diff --git a/marmite/proprietary/lib64/libimsmedia_jni.so b/marmite/proprietary/lib64/libimsmedia_jni.so
deleted file mode 100644
index 10cacf50..00000000
Binary files a/marmite/proprietary/lib64/libimsmedia_jni.so and /dev/null differ
diff --git a/marmite/proprietary/lib64/libqmi_cci_system.so b/marmite/proprietary/lib64/libqmi_cci_system.so
new file mode 100644
index 00000000..6d03b7bc
Binary files /dev/null and b/marmite/proprietary/lib64/libqmi_cci_system.so differ
diff --git a/marmite/proprietary/lib64/librcc.so b/marmite/proprietary/lib64/librcc.so
deleted file mode 100644
index a3637809..00000000
Binary files a/marmite/proprietary/lib64/librcc.so and /dev/null differ
diff --git a/marmite/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so b/marmite/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so
deleted file mode 100644
index ff38953c..00000000
Binary files a/marmite/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so and /dev/null differ
diff --git a/marmite/proprietary/priv-app/ims/ims.apk b/marmite/proprietary/priv-app/ims/ims.apk
deleted file mode 100644
index d097cbd3..00000000
Binary files a/marmite/proprietary/priv-app/ims/ims.apk and /dev/null differ
diff --git a/marmite/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/marmite/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
deleted file mode 100644
index 7508f8ee..00000000
Binary files a/marmite/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk and /dev/null differ
diff --git a/marmite/proprietary/product/app/imssettings/imssettings.apk b/marmite/proprietary/product/app/imssettings/imssettings.apk
new file mode 100644
index 00000000..b87a7a49
Binary files /dev/null and b/marmite/proprietary/product/app/imssettings/imssettings.apk differ
diff --git a/marmite/proprietary/product/app/uceShimService/uceShimService.apk b/marmite/proprietary/product/app/uceShimService/uceShimService.apk
new file mode 100644
index 00000000..dd31e55d
Binary files /dev/null and b/marmite/proprietary/product/app/uceShimService/uceShimService.apk differ
diff --git a/marmite/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml b/marmite/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml
new file mode 100644
index 00000000..35435a98
--- /dev/null
+++ b/marmite/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 Qualcomm Technologies, Inc.
+  ~ All Rights Reserved.
+  ~ Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<!--
+  ~ Copyright (c) 2017, The Linux Foundation. All rights reserved.
+
+  ~ Not a Contribution.
+-->
+
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<!--
+This XML file declares which signature|privileged permissions should be
+granted to privileged applications on QTI devices.
+It allows additional grants on top of privapp-permissions-platform.xml
+-->
+
+<permissions>
+
+    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="org.codeaurora.dialer">
+        <permission name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
+        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.STOP_APP_SWITCHES"/>
+        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
+        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="org.codeaurora.qti.qtiNetworkApp">
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="org.codeaurora.ims">
+        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.qualcomm.qti.carrierswitch">
+        <permission name="android.permission.REBOOT"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.mms">
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.qualcomm.qti.callenhancement">
+        <permission name="android.permission.RECORD_AUDIO" />
+        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
+        <permission name="android.permission.READ_EXTERNAL_STORAGE" />
+        <permission name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        <permission name="android.permission.READ_BLOCKED_NUMBERS" />
+        <permission name="android.permission.VIBRATE" />
+    </privapp-permissions>
+
+    <privapp-permissions package="org.codeaurora.qti.nrNetworkSettingApp">
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+</permissions>
diff --git a/marmite/proprietary/product/framework/qti-telephony-common.jar b/marmite/proprietary/product/framework/qti-telephony-common.jar
new file mode 100644
index 00000000..55f888b7
Binary files /dev/null and b/marmite/proprietary/product/framework/qti-telephony-common.jar differ
diff --git a/marmite/proprietary/product/lib64/lib-imscamera.so b/marmite/proprietary/product/lib64/lib-imscamera.so
new file mode 100644
index 00000000..67ff9ee5
Binary files /dev/null and b/marmite/proprietary/product/lib64/lib-imscamera.so differ
diff --git a/marmite/proprietary/product/lib64/lib-imsvideocodec.so b/marmite/proprietary/product/lib64/lib-imsvideocodec.so
new file mode 100644
index 00000000..66d05ea6
Binary files /dev/null and b/marmite/proprietary/product/lib64/lib-imsvideocodec.so differ
diff --git a/marmite/proprietary/product/lib64/lib-imsvt.so b/marmite/proprietary/product/lib64/lib-imsvt.so
new file mode 100644
index 00000000..d6444789
Binary files /dev/null and b/marmite/proprietary/product/lib64/lib-imsvt.so differ
diff --git a/marmite/proprietary/product/lib64/lib-imsvtextutils.so b/marmite/proprietary/product/lib64/lib-imsvtextutils.so
new file mode 100644
index 00000000..a7a8114a
Binary files /dev/null and b/marmite/proprietary/product/lib64/lib-imsvtextutils.so differ
diff --git a/marmite/proprietary/product/lib64/lib-imsvtutils.so b/marmite/proprietary/product/lib64/lib-imsvtutils.so
new file mode 100644
index 00000000..c2965bce
Binary files /dev/null and b/marmite/proprietary/product/lib64/lib-imsvtutils.so differ
diff --git a/marmite/proprietary/product/lib64/libimscamera_jni.so b/marmite/proprietary/product/lib64/libimscamera_jni.so
new file mode 100644
index 00000000..4e66b9b4
Binary files /dev/null and b/marmite/proprietary/product/lib64/libimscamera_jni.so differ
diff --git a/marmite/proprietary/product/lib64/libimsmedia_jni.so b/marmite/proprietary/product/lib64/libimsmedia_jni.so
new file mode 100644
index 00000000..4c49dfe4
Binary files /dev/null and b/marmite/proprietary/product/lib64/libimsmedia_jni.so differ
diff --git a/marmite/proprietary/product/lib64/vendor.qti.ims.callinfo@1.0.so b/marmite/proprietary/product/lib64/vendor.qti.ims.callinfo@1.0.so
new file mode 100644
index 00000000..3f698271
Binary files /dev/null and b/marmite/proprietary/product/lib64/vendor.qti.ims.callinfo@1.0.so differ
diff --git a/marmite/proprietary/product/lib64/vendor.qti.ims.rcsconfig@1.0.so b/marmite/proprietary/product/lib64/vendor.qti.ims.rcsconfig@1.0.so
new file mode 100644
index 00000000..b18eb8d2
Binary files /dev/null and b/marmite/proprietary/product/lib64/vendor.qti.ims.rcsconfig@1.0.so differ
diff --git a/marmite/proprietary/product/lib64/vendor.qti.ims.rcsconfig@1.1.so b/marmite/proprietary/product/lib64/vendor.qti.ims.rcsconfig@1.1.so
new file mode 100644
index 00000000..d7a32d7a
Binary files /dev/null and b/marmite/proprietary/product/lib64/vendor.qti.ims.rcsconfig@1.1.so differ
diff --git a/marmite/proprietary/product/lib64/vendor.qti.imsrtpservice@2.0.so b/marmite/proprietary/product/lib64/vendor.qti.imsrtpservice@2.0.so
new file mode 100644
index 00000000..bdb4b5ea
Binary files /dev/null and b/marmite/proprietary/product/lib64/vendor.qti.imsrtpservice@2.0.so differ
diff --git a/marmite/proprietary/product/lib64/vendor.qti.imsrtpservice@2.1.so b/marmite/proprietary/product/lib64/vendor.qti.imsrtpservice@2.1.so
new file mode 100644
index 00000000..e6648272
Binary files /dev/null and b/marmite/proprietary/product/lib64/vendor.qti.imsrtpservice@2.1.so differ
diff --git a/marmite/proprietary/product/priv-app/ims/ims.apk b/marmite/proprietary/product/priv-app/ims/ims.apk
new file mode 100644
index 00000000..ddfad7f7
Binary files /dev/null and b/marmite/proprietary/product/priv-app/ims/ims.apk differ
diff --git a/marmite/proprietary/product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/marmite/proprietary/product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
new file mode 100644
index 00000000..b9311a66
Binary files /dev/null and b/marmite/proprietary/product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk differ
diff --git a/marmite/proprietary/vendor/bin/ATFWD-daemon b/marmite/proprietary/vendor/bin/ATFWD-daemon
index eb4cbc75..0a64d962 100755
Binary files a/marmite/proprietary/vendor/bin/ATFWD-daemon and b/marmite/proprietary/vendor/bin/ATFWD-daemon differ
diff --git a/marmite/proprietary/vendor/bin/adpl b/marmite/proprietary/vendor/bin/adpl
new file mode 100755
index 00000000..01deaf59
Binary files /dev/null and b/marmite/proprietary/vendor/bin/adpl differ
diff --git a/marmite/proprietary/vendor/bin/hw/qcrild b/marmite/proprietary/vendor/bin/hw/qcrild
new file mode 100644
index 00000000..d2b8e5ef
Binary files /dev/null and b/marmite/proprietary/vendor/bin/hw/qcrild differ
diff --git a/marmite/proprietary/vendor/bin/ims_rtp_daemon b/marmite/proprietary/vendor/bin/ims_rtp_daemon
index 5e15cb19..4ddd79ef 100755
Binary files a/marmite/proprietary/vendor/bin/ims_rtp_daemon and b/marmite/proprietary/vendor/bin/ims_rtp_daemon differ
diff --git a/marmite/proprietary/vendor/bin/imsdatadaemon b/marmite/proprietary/vendor/bin/imsdatadaemon
index d61f05be..67c93b78 100755
Binary files a/marmite/proprietary/vendor/bin/imsdatadaemon and b/marmite/proprietary/vendor/bin/imsdatadaemon differ
diff --git a/marmite/proprietary/vendor/bin/imsqmidaemon b/marmite/proprietary/vendor/bin/imsqmidaemon
index 517ac84b..0af6cf46 100755
Binary files a/marmite/proprietary/vendor/bin/imsqmidaemon and b/marmite/proprietary/vendor/bin/imsqmidaemon differ
diff --git a/marmite/proprietary/vendor/bin/imsrcsd b/marmite/proprietary/vendor/bin/imsrcsd
index 1339ae90..bc7b8a8b 100755
Binary files a/marmite/proprietary/vendor/bin/imsrcsd and b/marmite/proprietary/vendor/bin/imsrcsd differ
diff --git a/marmite/proprietary/vendor/bin/ipacm-diag b/marmite/proprietary/vendor/bin/ipacm-diag
new file mode 100755
index 00000000..14e64570
Binary files /dev/null and b/marmite/proprietary/vendor/bin/ipacm-diag differ
diff --git a/marmite/proprietary/vendor/bin/irsc_util b/marmite/proprietary/vendor/bin/irsc_util
index fb91081d..b1012a47 100755
Binary files a/marmite/proprietary/vendor/bin/irsc_util and b/marmite/proprietary/vendor/bin/irsc_util differ
diff --git a/marmite/proprietary/vendor/bin/netmgrd b/marmite/proprietary/vendor/bin/netmgrd
index 41c25347..2904c79d 100755
Binary files a/marmite/proprietary/vendor/bin/netmgrd and b/marmite/proprietary/vendor/bin/netmgrd differ
diff --git a/marmite/proprietary/vendor/bin/port-bridge b/marmite/proprietary/vendor/bin/port-bridge
new file mode 100755
index 00000000..733f346a
Binary files /dev/null and b/marmite/proprietary/vendor/bin/port-bridge differ
diff --git a/marmite/proprietary/vendor/bin/qti b/marmite/proprietary/vendor/bin/qti
index 2117f90b..7672e7e4 100755
Binary files a/marmite/proprietary/vendor/bin/qti and b/marmite/proprietary/vendor/bin/qti differ
diff --git a/marmite/proprietary/vendor/bin/rmt_storage b/marmite/proprietary/vendor/bin/rmt_storage
index c79735df..e0a50ee2 100755
Binary files a/marmite/proprietary/vendor/bin/rmt_storage and b/marmite/proprietary/vendor/bin/rmt_storage differ
diff --git a/marmite/proprietary/vendor/bin/tftp_server b/marmite/proprietary/vendor/bin/tftp_server
index fcb28143..e2cc1443 100755
Binary files a/marmite/proprietary/vendor/bin/tftp_server and b/marmite/proprietary/vendor/bin/tftp_server differ
diff --git a/marmite/proprietary/vendor/etc/data/netmgr_config.xml b/marmite/proprietary/vendor/etc/data/netmgr_config.xml
index ecfc1a36..a08b14d3 100644
--- a/marmite/proprietary/vendor/etc/data/netmgr_config.xml
+++ b/marmite/proprietary/vendor/etc/data/netmgr_config.xml
@@ -593,6 +593,7 @@
       <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
 
       <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="tc_ul_baserate" type="int"> 85000000 </data>
       <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
       <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
       <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
@@ -636,7 +637,7 @@
          <data type="string"> rmnet_data7 </data>
       </list>
 
-      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="iwlan_enable" type="int"> 0 </data>
       <data name="rev_control_ports_len" type="int"> 9 </data>
       <list name="rev_control_ports">
          <data type="string"> r_rmnet_data0 </data>
@@ -2191,15 +2192,16 @@
       <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
       <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
       <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
+      <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
       <data name="netdev_max_backlog" type="int"> 10000 </data>
 
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
       <data name="disable_hystart" type="int"> 1 </data>
       <data name="initial_ssthresh" type="int"> 1400 </data>
-
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 13 </data>
       <data name="netdev_budget" type="int"> 0 </data>
+      <data name="tcp_mtu_probing" type="int"> 2 </data>
       <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
 
@@ -2299,12 +2301,12 @@
       <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
       <data name="rmnet_shs" type="int"> 0 </data>
       <data name="rmnet_perf" type="int"> 0 </data>
-
       <data name="netdev_max_backlog" type="int"> 100000 </data>
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
       <data name="disable_hystart" type="int"> 1 </data>
       <data name="initial_ssthresh" type="int"> 1400 </data>
       <data name="dl_marker_enabled" type="int"> 1 </data>
+      <data name="xlat_txcsum_disabled" type="int"> 0 </data>
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 13 </data>
       <data name="netdev_budget" type="int"> 0 </data>
@@ -2502,8 +2504,9 @@
       <data name="disable_hystart" type="int"> 1 </data>
       <data name="initial_ssthresh" type="int"> 1400 </data>
       <data name="dl_marker_enabled" type="int"> 1 </data>
+      <data name="xlat_txcsum_disabled" type="int"> 1 </data>
       <data name="pnd_rps_mask" type="int"> 2 </data>
-      <data name="vnd_rps_mask" type="int"> 13 </data>
+      <data name="vnd_rps_mask" type="int"> 125 </data>
       <data name="netdev_budget" type="int"> 0 </data>
       <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
diff --git a/marmite/proprietary/vendor/etc/init/dataadpl.rc b/marmite/proprietary/vendor/etc/init/dataadpl.rc
new file mode 100644
index 00000000..24152a12
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/dataadpl.rc
@@ -0,0 +1,13 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+# Create the directories used by DPM subsystem
+
+#start dataadpl service
+service vendor.dataadpl /system/vendor/bin/adpl
+    class main
+    user radio
+    socket adpl_cmd_uds_file dgram 660 radio radio
+    group radio oem_2901 diag usb inet
+    disabled
\ No newline at end of file
diff --git a/marmite/proprietary/vendor/etc/init/dataqti.rc b/marmite/proprietary/vendor/etc/init/dataqti.rc
new file mode 100644
index 00000000..4c682b6c
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/dataqti.rc
@@ -0,0 +1,19 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+# Create the directories used by DPM subsystem
+
+# msm specific files that need to be created on /data
+on post-fs-data
+    #Create DATAQTI dir for logs
+    mkdir /data/vendor/dataqti 0770 radio radio
+    chmod 0770 /data/vendor/dataqti
+
+#start dataqti service
+service vendor.dataqti /system/vendor/bin/qti
+    class main
+    user radio
+    socket qti_dpm_uds_file dgram 660 radio radio
+    group radio oem_2901 diag usb inet
+    disabled
diff --git a/marmite/proprietary/vendor/etc/init/ims_rtp_daemon.rc b/marmite/proprietary/vendor/etc/init/ims_rtp_daemon.rc
new file mode 100644
index 00000000..6f1a8953
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/ims_rtp_daemon.rc
@@ -0,0 +1,14 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+# imsdatadaemon starts with root and UID will be downgraded to RADIO.
+service vendor.ims_rtp_daemon /vendor/bin/ims_rtp_daemon
+    class main
+    user radio
+    group radio vendor_qti_diag inet log
+
+
+on property:vendor.ims.DATA_DAEMON_STATUS=1
+    restart vendor.ims_rtp_daemon
\ No newline at end of file
diff --git a/marmite/proprietary/vendor/etc/init/imsdatadaemon.rc b/marmite/proprietary/vendor/etc/init/imsdatadaemon.rc
new file mode 100644
index 00000000..6db60d2c
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/imsdatadaemon.rc
@@ -0,0 +1,15 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+# imsdatadaemon starts with root and UID will be downgraded to RADIO.
+service vendor.imsdatadaemon /vendor/bin/imsdatadaemon
+    class main
+    user radio
+    socket ims_datad stream 0660 system radio
+    group radio wifi inet vendor_qti_diag log
+    disabled
+
+on property:vendor.ims.QMI_DAEMON_STATUS=1
+    start vendor.imsdatadaemon
diff --git a/marmite/proprietary/vendor/etc/init/imsqmidaemon.rc b/marmite/proprietary/vendor/etc/init/imsqmidaemon.rc
new file mode 100644
index 00000000..c39f8e4d
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/imsqmidaemon.rc
@@ -0,0 +1,10 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+service vendor.imsqmidaemon /vendor/bin/imsqmidaemon
+    class main
+    user radio
+    socket ims_qmid stream 0660 system radio
+    group radio vendor_qti_diag log
diff --git a/marmite/proprietary/vendor/etc/init/imsrcsd.rc b/marmite/proprietary/vendor/etc/init/imsrcsd.rc
new file mode 100644
index 00000000..c2643ec1
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/imsrcsd.rc
@@ -0,0 +1,8 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+service vendor.imsrcsservice /vendor/bin/imsrcsd
+    class main
+    user radio
+    group radio vendor_qti_diag log inet wakelock
diff --git a/marmite/proprietary/vendor/etc/init/netmgrd.rc b/marmite/proprietary/vendor/etc/init/netmgrd.rc
new file mode 100644
index 00000000..40e2242b
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/netmgrd.rc
@@ -0,0 +1,57 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+on boot
+    #Create NETMGR daemon socket area
+    mkdir /dev/socket/netmgr 0750 radio radio
+
+    #Assign TCP buffer thresholds to be ceiling value of technology maximums
+    #Increased technology maximums should be reflected here.
+    write /proc/sys/net/core/rmem_max  16777216
+    write /proc/sys/net/core/wmem_max  8388608
+
+# msm specific files that need to be created on /data
+on post-fs-data
+    #Create NETMGR daemon log dir
+    mkdir /data/vendor/netmgr 0770 radio radio
+    chmod 0770 /data/vendor/netmgr
+
+    # Create netmgr recovery folder
+    mkdir /data/vendor/netmgr/recovery 0700 radio radio
+    chmod 0770 /data/vendor/netmgr/recovery
+    write /data/vendor/netmgr/recovery/recovery_info ""
+    chown radio radio /data/vendor/netmgr/recovery/recovery_info
+
+# Manage netmgrd based on value of property
+on property:persist.vendor.data.mode=disabled
+    stop vendor.netmgrd
+
+service vendor.netmgrd /system/vendor/bin/netmgrd
+    class main
+
+on property:ro.vendor.use_data_netmgrd=false
+    # netmgr not supported on specific target
+    stop vendor.netmgrd
+
+on property:ro.baseband=apq
+    stop vendor.netmgrd
+
+on property:persist.vendor.data.shs_ko_load=1
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules rmnet_shs
+
+on property:persist.vendor.data.shs_ko_load=0
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules rmnet_shs
+
+on property:persist.vendor.data.perf_ko_load=3
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -d /vendor/lib/modules rmnet_perf rmnet_perf_ingress_deag=N
+
+on property:persist.vendor.data.perf_ko_load=2
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -d /vendor/lib/modules rmnet_perf rmnet_perf_opt_mode="udp"
+
+on property:persist.vendor.data.perf_ko_load=1
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules rmnet_perf
+
+on property:persist.vendor.data.perf_ko_load=0
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules rmnet_perf
diff --git a/marmite/proprietary/vendor/etc/init/port-bridge.rc b/marmite/proprietary/vendor/etc/init/port-bridge.rc
new file mode 100644
index 00000000..a22e40a0
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/port-bridge.rc
@@ -0,0 +1,20 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+on boot
+    #Create PORT-BRIDGE daemon socket area
+    mkdir /dev/socket/port-bridge 0750 radio radio
+
+# msm specific files that need to be created on /data
+on post-fs-data
+    #Create port-bridge log dir
+    mkdir /data/vendor/port_bridge 0770 radio radio
+    chmod 0770 /data/vendor/port_bridge
+
+service vendor.port-bridge /system/vendor/bin/port-bridge
+    class main
+    user radio
+    group radio system inet
+    oneshot
diff --git a/marmite/proprietary/vendor/etc/init/qcrild.rc b/marmite/proprietary/vendor/etc/init/qcrild.rc
new file mode 100644
index 00000000..8aabd73f
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/qcrild.rc
@@ -0,0 +1,20 @@
+service vendor.qcrild /vendor/bin/hw/qcrild
+    class main
+    user radio
+    disabled
+    group radio cache inet misc audio log readproc wakelock oem_2901
+    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
+
+service vendor.qcrild2 /vendor/bin/hw/qcrild -c 2
+    class main
+    user radio
+    disabled
+    group radio cache inet misc audio log readproc wakelock oem_2901
+    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
+
+service vendor.qcrild3 /vendor/bin/hw/qcrild -c 3
+    class main
+    user radio
+    disabled
+    group radio cache inet misc audio log readproc wakelock oem_2901
+    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
diff --git a/marmite/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc b/marmite/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc
new file mode 100644
index 00000000..ffde8dba
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc
@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+service vendor.rmt_storage /vendor/bin/rmt_storage
+    class core
+    user root
+    shutdown critical
+    ioprio rt 0
\ No newline at end of file
diff --git a/marmite/proprietary/vendor/etc/init/vendor.qti.tftp.rc b/marmite/proprietary/vendor/etc/init/vendor.qti.tftp.rc
new file mode 100644
index 00000000..a14c359b
--- /dev/null
+++ b/marmite/proprietary/vendor/etc/init/vendor.qti.tftp.rc
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+service vendor.tftp_server /vendor/bin/tftp_server
+   class core
+   user root
\ No newline at end of file
diff --git a/marmite/proprietary/vendor/lib/libconfigdb.so b/marmite/proprietary/vendor/lib/libconfigdb.so
new file mode 100644
index 00000000..f7d6fdb1
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libconfigdb.so differ
diff --git a/marmite/proprietary/vendor/lib/libdiag.so b/marmite/proprietary/vendor/lib/libdiag.so
index 716bb5d8..780a43ec 100644
Binary files a/marmite/proprietary/vendor/lib/libdiag.so and b/marmite/proprietary/vendor/lib/libdiag.so differ
diff --git a/marmite/proprietary/vendor/lib/libdsi_netctrl.so b/marmite/proprietary/vendor/lib/libdsi_netctrl.so
index 078a09c0..0bc1d1f4 100644
Binary files a/marmite/proprietary/vendor/lib/libdsi_netctrl.so and b/marmite/proprietary/vendor/lib/libdsi_netctrl.so differ
diff --git a/marmite/proprietary/vendor/lib/libdsutils.so b/marmite/proprietary/vendor/lib/libdsutils.so
index 5215d37e..0cf23a09 100644
Binary files a/marmite/proprietary/vendor/lib/libdsutils.so and b/marmite/proprietary/vendor/lib/libdsutils.so differ
diff --git a/marmite/proprietary/vendor/lib/libidl.so b/marmite/proprietary/vendor/lib/libidl.so
index 8bf6ce9b..9c11cef8 100644
Binary files a/marmite/proprietary/vendor/lib/libidl.so and b/marmite/proprietary/vendor/lib/libidl.so differ
diff --git a/marmite/proprietary/vendor/lib/liblqe.so b/marmite/proprietary/vendor/lib/liblqe.so
new file mode 100644
index 00000000..703669b2
Binary files /dev/null and b/marmite/proprietary/vendor/lib/liblqe.so differ
diff --git a/marmite/proprietary/vendor/lib/libmdmdetect.so b/marmite/proprietary/vendor/lib/libmdmdetect.so
index c89ffa00..a0911041 100644
Binary files a/marmite/proprietary/vendor/lib/libmdmdetect.so and b/marmite/proprietary/vendor/lib/libmdmdetect.so differ
diff --git a/marmite/proprietary/vendor/lib/libnetmgr.so b/marmite/proprietary/vendor/lib/libnetmgr.so
new file mode 100644
index 00000000..5ab0880c
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libnetmgr.so differ
diff --git a/marmite/proprietary/vendor/lib/libnetmgr_common.so b/marmite/proprietary/vendor/lib/libnetmgr_common.so
new file mode 100644
index 00000000..a788e2b4
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libnetmgr_common.so differ
diff --git a/marmite/proprietary/vendor/lib/libnetmgr_nr_fusion.so b/marmite/proprietary/vendor/lib/libnetmgr_nr_fusion.so
new file mode 100644
index 00000000..9097f0a6
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libnetmgr_nr_fusion.so differ
diff --git a/marmite/proprietary/vendor/lib/libnetmgr_rmnet_ext.so b/marmite/proprietary/vendor/lib/libnetmgr_rmnet_ext.so
new file mode 100644
index 00000000..54a1584d
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libnetmgr_rmnet_ext.so differ
diff --git a/marmite/proprietary/vendor/lib/libnlnetmgr.so b/marmite/proprietary/vendor/lib/libnlnetmgr.so
new file mode 100644
index 00000000..0fc0b573
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libnlnetmgr.so differ
diff --git a/marmite/proprietary/vendor/lib/liboemaids_vendor.so b/marmite/proprietary/vendor/lib/liboemaids_vendor.so
new file mode 100644
index 00000000..4dc77805
Binary files /dev/null and b/marmite/proprietary/vendor/lib/liboemaids_vendor.so differ
diff --git a/marmite/proprietary/vendor/lib/libpdmapper.so b/marmite/proprietary/vendor/lib/libpdmapper.so
new file mode 100644
index 00000000..57e5007d
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libpdmapper.so differ
diff --git a/marmite/proprietary/vendor/lib/libpdnotifier.so b/marmite/proprietary/vendor/lib/libpdnotifier.so
new file mode 100644
index 00000000..c8defbf7
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libpdnotifier.so differ
diff --git a/marmite/proprietary/vendor/lib/libqcci_legacy.so b/marmite/proprietary/vendor/lib/libqcci_legacy.so
new file mode 100644
index 00000000..6e8d8571
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libqcci_legacy.so differ
diff --git a/marmite/proprietary/vendor/lib/libqcmaputils.so b/marmite/proprietary/vendor/lib/libqcmaputils.so
new file mode 100644
index 00000000..0af320c2
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libqcmaputils.so differ
diff --git a/marmite/proprietary/vendor/lib/libqcrilFramework.so b/marmite/proprietary/vendor/lib/libqcrilFramework.so
new file mode 100644
index 00000000..50772546
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libqcrilFramework.so differ
diff --git a/marmite/proprietary/vendor/lib/libqdi.so b/marmite/proprietary/vendor/lib/libqdi.so
index 876c0f9c..002b34fb 100644
Binary files a/marmite/proprietary/vendor/lib/libqdi.so and b/marmite/proprietary/vendor/lib/libqdi.so differ
diff --git a/marmite/proprietary/vendor/lib/libqdp.so b/marmite/proprietary/vendor/lib/libqdp.so
index 4e698bc4..167fd996 100644
Binary files a/marmite/proprietary/vendor/lib/libqdp.so and b/marmite/proprietary/vendor/lib/libqdp.so differ
diff --git a/marmite/proprietary/vendor/lib/libqmi.so b/marmite/proprietary/vendor/lib/libqmi.so
index 703cd3fc..49d020d3 100644
Binary files a/marmite/proprietary/vendor/lib/libqmi.so and b/marmite/proprietary/vendor/lib/libqmi.so differ
diff --git a/marmite/proprietary/vendor/lib/libqmi_cci.so b/marmite/proprietary/vendor/lib/libqmi_cci.so
index 094067e1..39a6de2f 100644
Binary files a/marmite/proprietary/vendor/lib/libqmi_cci.so and b/marmite/proprietary/vendor/lib/libqmi_cci.so differ
diff --git a/marmite/proprietary/vendor/lib/libqmi_client_helper.so b/marmite/proprietary/vendor/lib/libqmi_client_helper.so
index 59441d7a..721a924f 100644
Binary files a/marmite/proprietary/vendor/lib/libqmi_client_helper.so and b/marmite/proprietary/vendor/lib/libqmi_client_helper.so differ
diff --git a/marmite/proprietary/vendor/lib/libqmi_client_qmux.so b/marmite/proprietary/vendor/lib/libqmi_client_qmux.so
index 207e660a..e79015c9 100644
Binary files a/marmite/proprietary/vendor/lib/libqmi_client_qmux.so and b/marmite/proprietary/vendor/lib/libqmi_client_qmux.so differ
diff --git a/marmite/proprietary/vendor/lib/libqmi_common_so.so b/marmite/proprietary/vendor/lib/libqmi_common_so.so
index ab8428c9..a6bdf153 100644
Binary files a/marmite/proprietary/vendor/lib/libqmi_common_so.so and b/marmite/proprietary/vendor/lib/libqmi_common_so.so differ
diff --git a/marmite/proprietary/vendor/lib/libqmi_csi.so b/marmite/proprietary/vendor/lib/libqmi_csi.so
index a78f7863..1b5cf05f 100644
Binary files a/marmite/proprietary/vendor/lib/libqmi_csi.so and b/marmite/proprietary/vendor/lib/libqmi_csi.so differ
diff --git a/marmite/proprietary/vendor/lib/libqmi_encdec.so b/marmite/proprietary/vendor/lib/libqmi_encdec.so
index e14ba782..ed0d0c40 100644
Binary files a/marmite/proprietary/vendor/lib/libqmi_encdec.so and b/marmite/proprietary/vendor/lib/libqmi_encdec.so differ
diff --git a/marmite/proprietary/vendor/lib/libqmiservices.so b/marmite/proprietary/vendor/lib/libqmiservices.so
index ef4bc2db..ccbfd511 100644
Binary files a/marmite/proprietary/vendor/lib/libqmiservices.so and b/marmite/proprietary/vendor/lib/libqmiservices.so differ
diff --git a/marmite/proprietary/vendor/lib/libqrtr.so b/marmite/proprietary/vendor/lib/libqrtr.so
new file mode 100644
index 00000000..61ec4343
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libqrtr.so differ
diff --git a/marmite/proprietary/vendor/lib/libril-qc-hal-qmi.so b/marmite/proprietary/vendor/lib/libril-qc-hal-qmi.so
new file mode 100644
index 00000000..02edadd9
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libril-qc-hal-qmi.so differ
diff --git a/marmite/proprietary/vendor/lib/libril-qc-ltedirectdisc.so b/marmite/proprietary/vendor/lib/libril-qc-ltedirectdisc.so
new file mode 100644
index 00000000..81edbfd0
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libril-qc-ltedirectdisc.so differ
diff --git a/marmite/proprietary/vendor/lib/libril-qc-qmi-1.so b/marmite/proprietary/vendor/lib/libril-qc-qmi-1.so
new file mode 100644
index 00000000..99c04a01
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libril-qc-qmi-1.so differ
diff --git a/marmite/proprietary/vendor/lib/libril-qc-radioconfig.so b/marmite/proprietary/vendor/lib/libril-qc-radioconfig.so
new file mode 100644
index 00000000..e45dd4e5
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libril-qc-radioconfig.so differ
diff --git a/marmite/proprietary/vendor/lib/libril-qcril-hook-oem.so b/marmite/proprietary/vendor/lib/libril-qcril-hook-oem.so
new file mode 100644
index 00000000..5fa359eb
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libril-qcril-hook-oem.so differ
diff --git a/marmite/proprietary/vendor/lib/librilqmiservices.so b/marmite/proprietary/vendor/lib/librilqmiservices.so
new file mode 100644
index 00000000..b598f47d
Binary files /dev/null and b/marmite/proprietary/vendor/lib/librilqmiservices.so differ
diff --git a/marmite/proprietary/vendor/lib/libsettings.so b/marmite/proprietary/vendor/lib/libsettings.so
new file mode 100644
index 00000000..f5e2b0a5
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libsettings.so differ
diff --git a/marmite/proprietary/vendor/lib/libsystem_health_mon.so b/marmite/proprietary/vendor/lib/libsystem_health_mon.so
new file mode 100644
index 00000000..64f6a101
Binary files /dev/null and b/marmite/proprietary/vendor/lib/libsystem_health_mon.so differ
diff --git a/marmite/proprietary/vendor/lib/qcrild_librilutils.so b/marmite/proprietary/vendor/lib/qcrild_librilutils.so
new file mode 100644
index 00000000..6591defa
Binary files /dev/null and b/marmite/proprietary/vendor/lib/qcrild_librilutils.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.am@1.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.am@1.0.so
new file mode 100644
index 00000000..70607656
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.am@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.atcmdfwd@1.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.atcmdfwd@1.0.so
new file mode 100644
index 00000000..cd269f39
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.atcmdfwd@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.lpa@1.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.lpa@1.0.so
new file mode 100644
index 00000000..5ce1d839
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.lpa@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qcrilhook@1.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qcrilhook@1.0.so
new file mode 100644
index 00000000..f92a5abf
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qcrilhook@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qtiradio@1.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qtiradio@1.0.so
new file mode 100644
index 00000000..4fab539e
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qtiradio@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qtiradio@2.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qtiradio@2.0.so
new file mode 100644
index 00000000..fc4ec812
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.qtiradio@2.0.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim@1.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim@1.0.so
new file mode 100644
index 00000000..aec0cb45
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim@1.1.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim@1.1.so
new file mode 100644
index 00000000..e36377fa
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim@1.1.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim_remote_client@1.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim_remote_client@1.0.so
new file mode 100644
index 00000000..d848ce61
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim_remote_client@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim_remote_server@1.0.so b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim_remote_server@1.0.so
new file mode 100644
index 00000000..81893796
Binary files /dev/null and b/marmite/proprietary/vendor/lib/vendor.qti.hardware.radio.uim_remote_server@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so
new file mode 100644
index 00000000..03bc4971
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so
index a8f8ee71..0a380849 100644
Binary files a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so and b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so
index f2f100d0..c24842e7 100644
Binary files a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so and b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so differ
diff --git a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so
new file mode 100644
index 00000000..5423139a
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so differ
diff --git a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so
index 1c76925d..99891d48 100644
Binary files a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so and b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so
new file mode 100644
index 00000000..819edee5
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-dplmedia.so b/marmite/proprietary/vendor/lib64/lib-dplmedia.so
deleted file mode 100644
index 3d2c54e7..00000000
Binary files a/marmite/proprietary/vendor/lib64/lib-dplmedia.so and /dev/null differ
diff --git a/marmite/proprietary/vendor/lib64/lib-imsSDP.so b/marmite/proprietary/vendor/lib64/lib-imsSDP.so
index 68368ea5..dc0ce267 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-imsSDP.so and b/marmite/proprietary/vendor/lib64/lib-imsSDP.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-imscmservice.so b/marmite/proprietary/vendor/lib64/lib-imscmservice.so
index fa0439ee..a7417eaf 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-imscmservice.so and b/marmite/proprietary/vendor/lib64/lib-imscmservice.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-imsdpl.so b/marmite/proprietary/vendor/lib64/lib-imsdpl.so
index 07179381..4a782ac9 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-imsdpl.so and b/marmite/proprietary/vendor/lib64/lib-imsdpl.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-imsqimf.so b/marmite/proprietary/vendor/lib64/lib-imsqimf.so
index 26ccdec0..9319dbe7 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-imsqimf.so and b/marmite/proprietary/vendor/lib64/lib-imsqimf.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-imsrcs-v2.so b/marmite/proprietary/vendor/lib64/lib-imsrcs-v2.so
index b4966f6c..27189ff4 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-imsrcs-v2.so and b/marmite/proprietary/vendor/lib64/lib-imsrcs-v2.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so b/marmite/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so
index 29b507b9..8e4288ff 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so and b/marmite/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-imsvtcore.so b/marmite/proprietary/vendor/lib64/lib-imsvtcore.so
new file mode 100644
index 00000000..0185a49e
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/lib-imsvtcore.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-imsxml.so b/marmite/proprietary/vendor/lib64/lib-imsxml.so
index 84f8a52a..cbb4830d 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-imsxml.so and b/marmite/proprietary/vendor/lib64/lib-imsxml.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-rtpcommon.so b/marmite/proprietary/vendor/lib64/lib-rtpcommon.so
index fe40fffb..637df0bf 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-rtpcommon.so and b/marmite/proprietary/vendor/lib64/lib-rtpcommon.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-rtpcore.so b/marmite/proprietary/vendor/lib64/lib-rtpcore.so
index b631fa3b..1fa00133 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-rtpcore.so and b/marmite/proprietary/vendor/lib64/lib-rtpcore.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-rtpsl.so b/marmite/proprietary/vendor/lib64/lib-rtpsl.so
index f6a240ff..0c5389c2 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-rtpsl.so and b/marmite/proprietary/vendor/lib64/lib-rtpsl.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-siputility.so b/marmite/proprietary/vendor/lib64/lib-siputility.so
index 169a8cfc..2aafc59e 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-siputility.so and b/marmite/proprietary/vendor/lib64/lib-siputility.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-uceservice.so b/marmite/proprietary/vendor/lib64/lib-uceservice.so
index d565342c..f51e8e4b 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-uceservice.so and b/marmite/proprietary/vendor/lib64/lib-uceservice.so differ
diff --git a/marmite/proprietary/vendor/lib64/libconfigdb.so b/marmite/proprietary/vendor/lib64/libconfigdb.so
index 5d8ac264..cfa7b595 100644
Binary files a/marmite/proprietary/vendor/lib64/libconfigdb.so and b/marmite/proprietary/vendor/lib64/libconfigdb.so differ
diff --git a/marmite/proprietary/vendor/lib64/libdiag.so b/marmite/proprietary/vendor/lib64/libdiag.so
index 09cb17b0..cc43c133 100644
Binary files a/marmite/proprietary/vendor/lib64/libdiag.so and b/marmite/proprietary/vendor/lib64/libdiag.so differ
diff --git a/marmite/proprietary/vendor/lib64/libdsi_netctrl.so b/marmite/proprietary/vendor/lib64/libdsi_netctrl.so
index dd5fcc6c..7bac7600 100644
Binary files a/marmite/proprietary/vendor/lib64/libdsi_netctrl.so and b/marmite/proprietary/vendor/lib64/libdsi_netctrl.so differ
diff --git a/marmite/proprietary/vendor/lib64/libdsutils.so b/marmite/proprietary/vendor/lib64/libdsutils.so
index ccc23025..0ab44906 100644
Binary files a/marmite/proprietary/vendor/lib64/libdsutils.so and b/marmite/proprietary/vendor/lib64/libdsutils.so differ
diff --git a/marmite/proprietary/vendor/lib64/libidl.so b/marmite/proprietary/vendor/lib64/libidl.so
index f1710a90..2e2ab6cb 100644
Binary files a/marmite/proprietary/vendor/lib64/libidl.so and b/marmite/proprietary/vendor/lib64/libidl.so differ
diff --git a/marmite/proprietary/vendor/lib64/liblqe.so b/marmite/proprietary/vendor/lib64/liblqe.so
index d5797091..3e496e48 100644
Binary files a/marmite/proprietary/vendor/lib64/liblqe.so and b/marmite/proprietary/vendor/lib64/liblqe.so differ
diff --git a/marmite/proprietary/vendor/lib64/libmdmdetect.so b/marmite/proprietary/vendor/lib64/libmdmdetect.so
index 8a27ce49..cbafc5b9 100644
Binary files a/marmite/proprietary/vendor/lib64/libmdmdetect.so and b/marmite/proprietary/vendor/lib64/libmdmdetect.so differ
diff --git a/marmite/proprietary/vendor/lib64/libnetmgr.so b/marmite/proprietary/vendor/lib64/libnetmgr.so
index c243159d..3c1c965a 100644
Binary files a/marmite/proprietary/vendor/lib64/libnetmgr.so and b/marmite/proprietary/vendor/lib64/libnetmgr.so differ
diff --git a/marmite/proprietary/vendor/lib64/libnetmgr_common.so b/marmite/proprietary/vendor/lib64/libnetmgr_common.so
index 7b172653..10592b27 100644
Binary files a/marmite/proprietary/vendor/lib64/libnetmgr_common.so and b/marmite/proprietary/vendor/lib64/libnetmgr_common.so differ
diff --git a/marmite/proprietary/lib64/lib-imsvtutils.so b/marmite/proprietary/vendor/lib64/libnetmgr_nr_fusion.so
similarity index 71%
rename from marmite/proprietary/lib64/lib-imsvtutils.so
rename to marmite/proprietary/vendor/lib64/libnetmgr_nr_fusion.so
index d0b55628..80336cd6 100644
Binary files a/marmite/proprietary/lib64/lib-imsvtutils.so and b/marmite/proprietary/vendor/lib64/libnetmgr_nr_fusion.so differ
diff --git a/marmite/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so b/marmite/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so
new file mode 100644
index 00000000..3f8aca1e
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so differ
diff --git a/marmite/proprietary/vendor/lib64/libnlnetmgr.so b/marmite/proprietary/vendor/lib64/libnlnetmgr.so
index d0cf09c9..aa6c30d3 100644
Binary files a/marmite/proprietary/vendor/lib64/libnlnetmgr.so and b/marmite/proprietary/vendor/lib64/libnlnetmgr.so differ
diff --git a/marmite/proprietary/lib64/lib-imsvtextutils.so b/marmite/proprietary/vendor/lib64/liboemaids_vendor.so
similarity index 89%
rename from marmite/proprietary/lib64/lib-imsvtextutils.so
rename to marmite/proprietary/vendor/lib64/liboemaids_vendor.so
index 34eeb9f3..b6018a24 100644
Binary files a/marmite/proprietary/lib64/lib-imsvtextutils.so and b/marmite/proprietary/vendor/lib64/liboemaids_vendor.so differ
diff --git a/marmite/proprietary/vendor/lib64/libpdmapper.so b/marmite/proprietary/vendor/lib64/libpdmapper.so
new file mode 100644
index 00000000..63a64ae1
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/libpdmapper.so differ
diff --git a/marmite/proprietary/lib64/libimscamera_jni.so b/marmite/proprietary/vendor/lib64/libpdnotifier.so
similarity index 80%
rename from marmite/proprietary/lib64/libimscamera_jni.so
rename to marmite/proprietary/vendor/lib64/libpdnotifier.so
index 51af3d0b..ab6efb8e 100644
Binary files a/marmite/proprietary/lib64/libimscamera_jni.so and b/marmite/proprietary/vendor/lib64/libpdnotifier.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqcci_legacy.so b/marmite/proprietary/vendor/lib64/libqcci_legacy.so
new file mode 100644
index 00000000..fd9f9b10
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/libqcci_legacy.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqcmaputils.so b/marmite/proprietary/vendor/lib64/libqcmaputils.so
index 58a61f07..7561a9c6 100644
Binary files a/marmite/proprietary/vendor/lib64/libqcmaputils.so and b/marmite/proprietary/vendor/lib64/libqcmaputils.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqcrilFramework.so b/marmite/proprietary/vendor/lib64/libqcrilFramework.so
new file mode 100644
index 00000000..06c8679b
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/libqcrilFramework.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqdi.so b/marmite/proprietary/vendor/lib64/libqdi.so
index 2cdfaf2c..0ab336c3 100644
Binary files a/marmite/proprietary/vendor/lib64/libqdi.so and b/marmite/proprietary/vendor/lib64/libqdi.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqdp.so b/marmite/proprietary/vendor/lib64/libqdp.so
index 14a5fe13..b03a9e1c 100644
Binary files a/marmite/proprietary/vendor/lib64/libqdp.so and b/marmite/proprietary/vendor/lib64/libqdp.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqmi.so b/marmite/proprietary/vendor/lib64/libqmi.so
index 4ba0c4b0..1609f4c0 100644
Binary files a/marmite/proprietary/vendor/lib64/libqmi.so and b/marmite/proprietary/vendor/lib64/libqmi.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqmi_cci.so b/marmite/proprietary/vendor/lib64/libqmi_cci.so
index 2b403a3e..25bd378e 100644
Binary files a/marmite/proprietary/vendor/lib64/libqmi_cci.so and b/marmite/proprietary/vendor/lib64/libqmi_cci.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqmi_client_helper.so b/marmite/proprietary/vendor/lib64/libqmi_client_helper.so
index 551919ea..96836e17 100644
Binary files a/marmite/proprietary/vendor/lib64/libqmi_client_helper.so and b/marmite/proprietary/vendor/lib64/libqmi_client_helper.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqmi_client_qmux.so b/marmite/proprietary/vendor/lib64/libqmi_client_qmux.so
index 1fd6a4c0..20e692ba 100644
Binary files a/marmite/proprietary/vendor/lib64/libqmi_client_qmux.so and b/marmite/proprietary/vendor/lib64/libqmi_client_qmux.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqmi_common_so.so b/marmite/proprietary/vendor/lib64/libqmi_common_so.so
index 1283ef18..65561c16 100644
Binary files a/marmite/proprietary/vendor/lib64/libqmi_common_so.so and b/marmite/proprietary/vendor/lib64/libqmi_common_so.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqmi_csi.so b/marmite/proprietary/vendor/lib64/libqmi_csi.so
index 69027511..a9c6d669 100644
Binary files a/marmite/proprietary/vendor/lib64/libqmi_csi.so and b/marmite/proprietary/vendor/lib64/libqmi_csi.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqmi_encdec.so b/marmite/proprietary/vendor/lib64/libqmi_encdec.so
index 6a9e7aa0..5a698a4f 100644
Binary files a/marmite/proprietary/vendor/lib64/libqmi_encdec.so and b/marmite/proprietary/vendor/lib64/libqmi_encdec.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqmiservices.so b/marmite/proprietary/vendor/lib64/libqmiservices.so
index 10d1bf27..036cedc5 100644
Binary files a/marmite/proprietary/vendor/lib64/libqmiservices.so and b/marmite/proprietary/vendor/lib64/libqmiservices.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqrtr.so b/marmite/proprietary/vendor/lib64/libqrtr.so
index 96290e18..6bd58528 100644
Binary files a/marmite/proprietary/vendor/lib64/libqrtr.so and b/marmite/proprietary/vendor/lib64/libqrtr.so differ
diff --git a/marmite/proprietary/vendor/lib64/libqsocket.so b/marmite/proprietary/vendor/lib64/libqsocket.so
index 6813511e..1f18d1b0 100644
Binary files a/marmite/proprietary/vendor/lib64/libqsocket.so and b/marmite/proprietary/vendor/lib64/libqsocket.so differ
diff --git a/marmite/proprietary/vendor/lib64/librcc.so b/marmite/proprietary/vendor/lib64/librcc.so
new file mode 100644
index 00000000..3cfbea6e
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/librcc.so differ
diff --git a/marmite/proprietary/vendor/lib64/libril-qc-hal-qmi.so b/marmite/proprietary/vendor/lib64/libril-qc-hal-qmi.so
new file mode 100644
index 00000000..fe1f1d19
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/libril-qc-hal-qmi.so differ
diff --git a/marmite/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so b/marmite/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so
index 533ff8f6..844e2446 100644
Binary files a/marmite/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so and b/marmite/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so differ
diff --git a/marmite/proprietary/vendor/lib64/libril-qc-qmi-1.so b/marmite/proprietary/vendor/lib64/libril-qc-qmi-1.so
index 5da4acdc..6772725f 100644
Binary files a/marmite/proprietary/vendor/lib64/libril-qc-qmi-1.so and b/marmite/proprietary/vendor/lib64/libril-qc-qmi-1.so differ
diff --git a/marmite/proprietary/vendor/lib64/libril-qc-radioconfig.so b/marmite/proprietary/vendor/lib64/libril-qc-radioconfig.so
index ef5c9d49..b9832728 100644
Binary files a/marmite/proprietary/vendor/lib64/libril-qc-radioconfig.so and b/marmite/proprietary/vendor/lib64/libril-qc-radioconfig.so differ
diff --git a/marmite/proprietary/vendor/lib64/libril-qcril-hook-oem.so b/marmite/proprietary/vendor/lib64/libril-qcril-hook-oem.so
index 6be285fa..0768eb61 100644
Binary files a/marmite/proprietary/vendor/lib64/libril-qcril-hook-oem.so and b/marmite/proprietary/vendor/lib64/libril-qcril-hook-oem.so differ
diff --git a/marmite/proprietary/vendor/lib64/librilqmiservices.so b/marmite/proprietary/vendor/lib64/librilqmiservices.so
index 6fc5760c..c6e38846 100644
Binary files a/marmite/proprietary/vendor/lib64/librilqmiservices.so and b/marmite/proprietary/vendor/lib64/librilqmiservices.so differ
diff --git a/marmite/proprietary/vendor/lib64/libsettings.so b/marmite/proprietary/vendor/lib64/libsettings.so
index 8b96065f..f4240feb 100644
Binary files a/marmite/proprietary/vendor/lib64/libsettings.so and b/marmite/proprietary/vendor/lib64/libsettings.so differ
diff --git a/marmite/proprietary/vendor/lib64/libsystem_health_mon.so b/marmite/proprietary/vendor/lib64/libsystem_health_mon.so
index 18acc85e..65b490f7 100644
Binary files a/marmite/proprietary/vendor/lib64/libsystem_health_mon.so and b/marmite/proprietary/vendor/lib64/libsystem_health_mon.so differ
diff --git a/marmite/proprietary/vendor/lib64/lib-rtpdaemoninterface.so b/marmite/proprietary/vendor/lib64/qcrild_librilutils.so
similarity index 88%
rename from marmite/proprietary/vendor/lib64/lib-rtpdaemoninterface.so
rename to marmite/proprietary/vendor/lib64/qcrild_librilutils.so
index efeea8b5..e499d49f 100644
Binary files a/marmite/proprietary/vendor/lib64/lib-rtpdaemoninterface.so and b/marmite/proprietary/vendor/lib64/qcrild_librilutils.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so
index 5e057099..7a2faa92 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
index e5e2e724..0ea7f98d 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so
index 31045b29..f7e67bba 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so
new file mode 100644
index 00000000..e70356e9
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so
new file mode 100644
index 00000000..32967300
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so
new file mode 100644
index 00000000..593bf635
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so
new file mode 100644
index 00000000..59cee2b4
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so
new file mode 100644
index 00000000..f264c891
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so
new file mode 100644
index 00000000..e2f7dcc0
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so
index 015da243..326a991e 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so
index 0f083419..8010c279 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so
index b7f5084c..e47e64c1 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so
index 2f70639b..b7578fb6 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so
index 6b728e70..70bc0ad6 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so
index 11ab9968..9143ba59 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so
index ba728c37..d169da60 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so
index 024e62ab..64a16cb5 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so
index cf750f18..3f698271 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so
index bb1b4cf3..b18eb8d2 100644
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so and b/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so b/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so
new file mode 100644
index 00000000..d7a32d7a
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so b/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so
deleted file mode 100644
index 089ad7f4..00000000
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so and /dev/null differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@1.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@1.0.so
deleted file mode 100644
index ff38953c..00000000
Binary files a/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@1.0.so and /dev/null differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.0.so b/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.0.so
new file mode 100644
index 00000000..bdb4b5ea
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.0.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1-service-Impl.so b/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1-service-Impl.so
new file mode 100644
index 00000000..3c74c823
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1-service-Impl.so differ
diff --git a/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1.so b/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1.so
new file mode 100644
index 00000000..e6648272
Binary files /dev/null and b/marmite/proprietary/vendor/lib64/vendor.qti.imsrtpservice@2.1.so differ
diff --git a/marmite/proprietary/vendor/radio/qcril_database/qcril.db b/marmite/proprietary/vendor/radio/qcril_database/qcril.db
index e1657921..df4bfe93 100644
Binary files a/marmite/proprietary/vendor/radio/qcril_database/qcril.db and b/marmite/proprietary/vendor/radio/qcril_database/qcril.db differ