diff --git a/sdm660-common/Android.bp b/sdm660-common/Android.bp
index 78067c3..5328641 100644
--- a/sdm660-common/Android.bp
+++ b/sdm660-common/Android.bp
@@ -5,25 +5,6 @@
 soong_namespace {
 }
 
-cc_prebuilt_library_shared {
-	name: "libantradio",
-	owner: "asus",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/lib/libantradio.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/lib64/libantradio.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libthermalclient",
 	owner: "asus",
@@ -45,94 +26,26 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "com.quicinc.cne.api@1.0",
+	name: "libtime_genoff",
 	owner: "asus",
 	strip: {
 		none: true,
 	},
 	target: {
 		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so"],
+			srcs: ["proprietary/vendor/lib64/libtime_genoff.so"],
 		},
 	},
 	compile_multilib: "64",
 	check_elf_files: false,
 	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "com.quicinc.cne.api@1.1",
-	owner: "asus",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "com.quicinc.cne.constants@1.0",
-	owner: "asus",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "com.quicinc.cne.constants@2.0",
-	owner: "asus",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "com.quicinc.cne.constants@2.1",
-	owner: "asus",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so"],
-		},
-	},
-	compile_multilib: "64",
-	check_elf_files: false,
-	prefer: true,
-	system_ext_specific: true,
+	soc_specific: true,
 }
 
 android_app_import {
 	name: "WfdService",
 	owner: "asus",
-	apk: "proprietary/system/priv-app/WfdService/WfdService.apk",
+	apk: "proprietary/priv-app/WfdService/WfdService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -140,6 +53,17 @@ android_app_import {
 	privileged: true,
 }
 
+android_app_import {
+	name: "CACertService",
+	owner: "asus",
+	apk: "proprietary/vendor/app/CACertService/CACertService.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	soc_specific: true,
+}
+
 android_app_import {
 	name: "CneApp",
 	owner: "asus",
@@ -163,10 +87,10 @@ android_app_import {
 }
 
 android_app_import {
-	name: "TimeService",
+	name: "QCC-TR-UI",
 	owner: "asus",
-	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
-	certificate: "platform",
+	apk: "proprietary/vendor/app/QCC-TR-UI/QCC-TR-UI.apk",
+	presigned: true,
 	dex_preopt: {
 		enabled: false,
 	},
@@ -174,9 +98,20 @@ android_app_import {
 }
 
 android_app_import {
-	name: "PowerOffAlarm",
+	name: "TimeService",
 	owner: "asus",
-	apk: "proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk",
+	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	soc_specific: true,
+}
+
+android_app_import {
+	name: "CallFeaturesSetting",
+	owner: "asus",
+	apk: "proprietary/product/app/CallFeaturesSetting/CallFeaturesSetting.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -184,6 +119,28 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "ConfURIDialer",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/ConfURIDialer/ConfURIDialer.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "ConferenceDialer",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/ConferenceDialer/ConferenceDialer.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "DeviceInfo",
 	owner: "asus",
@@ -195,6 +152,50 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "DeviceStatisticsService",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "DynamicDDSService",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "NetworkSetting",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/NetworkSetting/NetworkSetting.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "QTIDiagServices",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/QTIDiagServices/QTIDiagServices.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "QtiTelephonyService",
 	owner: "asus",
@@ -206,6 +207,39 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "SimContact",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/SimContact/SimContact.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "SimSettings",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/SimSettings/SimSettings.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "atfwd",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/atfwd/atfwd.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "datastatusnotification",
 	owner: "asus",
@@ -239,6 +273,106 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "remoteSimLockAuthentication",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "remotesimlockservice",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "uceShimService",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/uceShimService/uceShimService.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "uimgbaservice",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "uimlpaservice",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "uimremoteclient",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "uimremoteserver",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "xdivert",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/xdivert/xdivert.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "QAS_DVC_MSP",
+	owner: "asus",
+	apk: "proprietary/system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "dpmserviceapp",
 	owner: "asus",
@@ -278,7 +412,20 @@ android_app_import {
 dex_import {
 	name: "WfdCommon",
 	owner: "asus",
-	jars: ["proprietary/system/framework/WfdCommon.jar"],
+	jars: ["proprietary/framework/WfdCommon.jar"],
+}
+
+dex_import {
+	name: "tcmclient",
+	owner: "asus",
+	jars: ["proprietary/system/framework/tcmclient.jar"],
+}
+
+dex_import {
+	name: "ActivityExt",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/ActivityExt.jar"],
+	system_ext_specific: true,
 }
 
 dex_import {
@@ -288,6 +435,384 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "com.qti.dpmframework",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.qualcomm.qti.imscmservice-V2.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.qualcomm.qti.imscmservice-V2.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.qualcomm.qti.imscmservice-V2.2-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.qualcomm.qti.uceservice-V2.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.qualcomm.qti.uceservice-V2.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.qualcomm.qti.uceservice-V2.2-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.2-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.qualcomm.qti.uceservice-V2.3-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.3-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.api-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.api-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.api-V1.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.api-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.constants-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.constants-V2.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.constants-V2.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.constants-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "dpmapi",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/dpmapi.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "embmslibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/embmslibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "qcrilhook",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/qcrilhook.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "qti-telephony-common",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/qti-telephony-common.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "remotesimlockmanagerlibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/remotesimlockmanagerlibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimgbalibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimgbalibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimgbamanagerlibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimgbamanagerlibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimlpalibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimlpalibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimremoteclientlibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimremoteclientlibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimremoteserverlibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimremoteserverlibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimremotesimlocklibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimremotesimlocklibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimservicelibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimservicelibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.data.factory-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.data.factory-V2.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.data.factory-V2.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.data.factory-V2.2-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.2-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.data.factory-V2.3-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.3-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.data.mwqem-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.mwqem-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.data.slm-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.slm-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.cne.internal.api-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.cne.internal.constants-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.cne.internal.server-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.connection-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.connection-V1.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.dynamicdds-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.iwlan-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.latency-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.latency-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.lce-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.lce-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.qmi-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.mwqemadapter-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.mwqemadapter-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.slmadapter-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.slmadapter-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.callcapability-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.callinfo-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.factory-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.factory-V1.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcsconfig-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcsconfig-V1.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcsconfig-V2.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcsconfig-V2.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.latency-V2.0-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.latency-V2.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.latency-V2.1-java",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
 prebuilt_etc_xml {
 	name: "vendor.qti.gnss@3.0-service",
 	owner: "asus",
diff --git a/sdm660-common/proprietary/bin/wfdservice b/sdm660-common/proprietary/bin/wfdservice
new file mode 100755
index 0000000..4a8b554
Binary files /dev/null and b/sdm660-common/proprietary/bin/wfdservice differ
diff --git a/sdm660-common/proprietary/system/etc/init/wfdservice.rc b/sdm660-common/proprietary/etc/init/wfdservice.rc
similarity index 100%
rename from sdm660-common/proprietary/system/etc/init/wfdservice.rc
rename to sdm660-common/proprietary/etc/init/wfdservice.rc
diff --git a/sdm660-common/proprietary/system/etc/wfdconfig.xml b/sdm660-common/proprietary/etc/wfdconfig.xml
similarity index 100%
rename from sdm660-common/proprietary/system/etc/wfdconfig.xml
rename to sdm660-common/proprietary/etc/wfdconfig.xml
diff --git a/sdm660-common/proprietary/system/etc/wfdconfigsink.xml b/sdm660-common/proprietary/etc/wfdconfigsink.xml
similarity index 100%
rename from sdm660-common/proprietary/system/etc/wfdconfigsink.xml
rename to sdm660-common/proprietary/etc/wfdconfigsink.xml
diff --git a/sdm660-common/proprietary/framework/WfdCommon.jar b/sdm660-common/proprietary/framework/WfdCommon.jar
new file mode 100644
index 0000000..8ee3ee6
Binary files /dev/null and b/sdm660-common/proprietary/framework/WfdCommon.jar differ
diff --git a/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so b/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
new file mode 100644
index 0000000..2744180
Binary files /dev/null and b/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so differ
diff --git a/sdm660-common/proprietary/lib/libFileMux.so b/sdm660-common/proprietary/lib/libFileMux.so
index 93549e7..d3b9f58 100644
Binary files a/sdm660-common/proprietary/lib/libFileMux.so and b/sdm660-common/proprietary/lib/libFileMux.so differ
diff --git a/sdm660-common/proprietary/lib/libOmxMux.so b/sdm660-common/proprietary/lib/libOmxMux.so
index fa1bccd..9e1261e 100644
Binary files a/sdm660-common/proprietary/lib/libOmxMux.so and b/sdm660-common/proprietary/lib/libOmxMux.so differ
diff --git a/sdm660-common/proprietary/lib/libantradio.so b/sdm660-common/proprietary/lib/libantradio.so
deleted file mode 100644
index 08174d0..0000000
Binary files a/sdm660-common/proprietary/lib/libantradio.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib/libwfdavenhancements.so b/sdm660-common/proprietary/lib/libwfdavenhancements.so
new file mode 100644
index 0000000..457afce
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdavenhancements.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdclient.so b/sdm660-common/proprietary/lib/libwfdclient.so
new file mode 100644
index 0000000..a16004f
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdclient.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdcodecv4l2.so b/sdm660-common/proprietary/lib/libwfdcodecv4l2.so
new file mode 100644
index 0000000..3428ed5
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdcodecv4l2.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdcommonutils.so b/sdm660-common/proprietary/lib/libwfdcommonutils.so
new file mode 100644
index 0000000..c437b7f
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdcommonutils.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdconfigutils.so b/sdm660-common/proprietary/lib/libwfdconfigutils.so
new file mode 100644
index 0000000..66b206a
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdconfigutils.so differ
diff --git a/sdm660-common/proprietary/lib/libwfddisplayconfig.so b/sdm660-common/proprietary/lib/libwfddisplayconfig.so
new file mode 100644
index 0000000..1eb00cb
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfddisplayconfig.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdmminterface.so b/sdm660-common/proprietary/lib/libwfdmminterface.so
new file mode 100644
index 0000000..19fedbe
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdmminterface.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdmmsink.so b/sdm660-common/proprietary/lib/libwfdmmsink.so
new file mode 100644
index 0000000..4140295
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdmmsink.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdmmsrc.so b/sdm660-common/proprietary/lib/libwfdmmsrc.so
new file mode 100644
index 0000000..f600994
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdmmsrc.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdnative.so b/sdm660-common/proprietary/lib/libwfdnative.so
new file mode 100644
index 0000000..c724ff3
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdnative.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdrtsp.so b/sdm660-common/proprietary/lib/libwfdrtsp.so
new file mode 100644
index 0000000..6c76cec
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdrtsp.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdservice.so b/sdm660-common/proprietary/lib/libwfdservice.so
new file mode 100644
index 0000000..9fb1c83
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdservice.so differ
diff --git a/sdm660-common/proprietary/lib/libwfdsm.so b/sdm660-common/proprietary/lib/libwfdsm.so
new file mode 100644
index 0000000..fa762e7
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfdsm.so differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcinterface.so b/sdm660-common/proprietary/lib/libwfduibcinterface.so
new file mode 100644
index 0000000..479a1cc
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfduibcinterface.so differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcsink.so b/sdm660-common/proprietary/lib/libwfduibcsink.so
new file mode 100644
index 0000000..5a77b74
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfduibcsink.so differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcsinkinterface.so b/sdm660-common/proprietary/lib/libwfduibcsinkinterface.so
new file mode 100644
index 0000000..1c2e433
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfduibcsinkinterface.so differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcsrc.so b/sdm660-common/proprietary/lib/libwfduibcsrc.so
new file mode 100644
index 0000000..5d228ba
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfduibcsrc.so differ
diff --git a/sdm660-common/proprietary/lib/libwfduibcsrcinterface.so b/sdm660-common/proprietary/lib/libwfduibcsrcinterface.so
new file mode 100644
index 0000000..080ad66
Binary files /dev/null and b/sdm660-common/proprietary/lib/libwfduibcsrcinterface.so differ
diff --git a/sdm660-common/proprietary/lib64/fm_helium.so b/sdm660-common/proprietary/lib64/fm_helium.so
deleted file mode 100644
index 92ca2d6..0000000
Binary files a/sdm660-common/proprietary/lib64/fm_helium.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib64/libFileMux.so b/sdm660-common/proprietary/lib64/libFileMux.so
new file mode 100644
index 0000000..e2e119e
Binary files /dev/null and b/sdm660-common/proprietary/lib64/libFileMux.so differ
diff --git a/sdm660-common/proprietary/lib64/libOmxMux.so b/sdm660-common/proprietary/lib64/libOmxMux.so
new file mode 100644
index 0000000..0537243
Binary files /dev/null and b/sdm660-common/proprietary/lib64/libOmxMux.so differ
diff --git a/sdm660-common/proprietary/lib64/libantradio.so b/sdm660-common/proprietary/lib64/libantradio.so
deleted file mode 100644
index bdc1714..0000000
Binary files a/sdm660-common/proprietary/lib64/libantradio.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib64/libfm-hci.so b/sdm660-common/proprietary/lib64/libfm-hci.so
deleted file mode 100644
index 26a2a65..0000000
Binary files a/sdm660-common/proprietary/lib64/libfm-hci.so and /dev/null differ
diff --git a/sdm660-common/proprietary/lib64/libwfdclient.so b/sdm660-common/proprietary/lib64/libwfdclient.so
new file mode 100644
index 0000000..1d31cdb
Binary files /dev/null and b/sdm660-common/proprietary/lib64/libwfdclient.so differ
diff --git a/sdm660-common/proprietary/lib64/libwfdnative.so b/sdm660-common/proprietary/lib64/libwfdnative.so
new file mode 100644
index 0000000..c252269
Binary files /dev/null and b/sdm660-common/proprietary/lib64/libwfdnative.so differ
diff --git a/sdm660-common/proprietary/priv-app/WfdService/WfdService.apk b/sdm660-common/proprietary/priv-app/WfdService/WfdService.apk
new file mode 100644
index 0000000..e55098f
Binary files /dev/null and b/sdm660-common/proprietary/priv-app/WfdService/WfdService.apk differ
diff --git a/sdm660-common/proprietary/product/app/CallFeaturesSetting/CallFeaturesSetting.apk b/sdm660-common/proprietary/product/app/CallFeaturesSetting/CallFeaturesSetting.apk
new file mode 100644
index 0000000..568f8a3
Binary files /dev/null and b/sdm660-common/proprietary/product/app/CallFeaturesSetting/CallFeaturesSetting.apk differ
diff --git a/sdm660-common/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk b/sdm660-common/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
deleted file mode 100644
index 9e7ca7a..0000000
Binary files a/sdm660-common/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml b/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml
new file mode 100644
index 0000000..045550c
--- /dev/null
+++ b/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml
@@ -0,0 +1,46 @@
+<?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="org.codeaurora.qti.qtiNetworkApp">
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.qualcomm.qti.carrierswitch">
+        <permission name="android.permission.REBOOT"/>
+    </privapp-permissions>
+
+</permissions>
diff --git a/sdm660-common/proprietary/product/framework/vendor.qti.hardware.soter-V1.0-java.jar b/sdm660-common/proprietary/product/framework/vendor.qti.hardware.soter-V1.0-java.jar
deleted file mode 100644
index 4516b37..0000000
Binary files a/sdm660-common/proprietary/product/framework/vendor.qti.hardware.soter-V1.0-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/lib64/com.qualcomm.qti.ant@1.0.so b/sdm660-common/proprietary/product/lib64/com.qualcomm.qti.ant@1.0.so
deleted file mode 100644
index a955889..0000000
Binary files a/sdm660-common/proprietary/product/lib64/com.qualcomm.qti.ant@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so b/sdm660-common/proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so
deleted file mode 100644
index 52af7ca..0000000
Binary files a/sdm660-common/proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/bin/wfdservice b/sdm660-common/proprietary/system/bin/wfdservice
deleted file mode 100755
index e16c812..0000000
Binary files a/sdm660-common/proprietary/system/bin/wfdservice and /dev/null differ
diff --git a/sdm660-common/proprietary/system/framework/WfdCommon.jar b/sdm660-common/proprietary/system/framework/WfdCommon.jar
deleted file mode 100644
index 9868349..0000000
Binary files a/sdm660-common/proprietary/system/framework/WfdCommon.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/framework/tcmclient.jar b/sdm660-common/proprietary/system/framework/tcmclient.jar
similarity index 96%
rename from sdm660-common/proprietary/framework/tcmclient.jar
rename to sdm660-common/proprietary/system/framework/tcmclient.jar
index 883027d..00204a5 100644
Binary files a/sdm660-common/proprietary/framework/tcmclient.jar and b/sdm660-common/proprietary/system/framework/tcmclient.jar differ
diff --git a/sdm660-common/proprietary/system/lib/com.qualcomm.qti.wifidisplayhal@1.0.so b/sdm660-common/proprietary/system/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
deleted file mode 100644
index ace701b..0000000
Binary files a/sdm660-common/proprietary/system/lib/com.qualcomm.qti.wifidisplayhal@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libmmrtpdecoder.so b/sdm660-common/proprietary/system/lib/libmmrtpdecoder.so
deleted file mode 100644
index 5353043..0000000
Binary files a/sdm660-common/proprietary/system/lib/libmmrtpdecoder.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libmmrtpencoder.so b/sdm660-common/proprietary/system/lib/libmmrtpencoder.so
deleted file mode 100644
index af37b1f..0000000
Binary files a/sdm660-common/proprietary/system/lib/libmmrtpencoder.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdavenhancements.so b/sdm660-common/proprietary/system/lib/libwfdavenhancements.so
deleted file mode 100644
index 7a20a8b..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdavenhancements.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdclient.so b/sdm660-common/proprietary/system/lib/libwfdclient.so
deleted file mode 100644
index f2f771a..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdclient.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdcodecv4l2.so b/sdm660-common/proprietary/system/lib/libwfdcodecv4l2.so
deleted file mode 100644
index 9b6ec1e..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdcodecv4l2.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdcommonutils.so b/sdm660-common/proprietary/system/lib/libwfdcommonutils.so
deleted file mode 100644
index b86e242..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdcommonutils.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdconfigutils.so b/sdm660-common/proprietary/system/lib/libwfdconfigutils.so
deleted file mode 100644
index dff3609..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdconfigutils.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdmminterface.so b/sdm660-common/proprietary/system/lib/libwfdmminterface.so
deleted file mode 100644
index 44ca334..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdmminterface.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdmmsink.so b/sdm660-common/proprietary/system/lib/libwfdmmsink.so
deleted file mode 100644
index 99418e3..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdmmsink.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdmmsrc.so b/sdm660-common/proprietary/system/lib/libwfdmmsrc.so
deleted file mode 100644
index 0328051..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdmmsrc.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdnative.so b/sdm660-common/proprietary/system/lib/libwfdnative.so
deleted file mode 100644
index 12c9756..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdnative.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdrtsp.so b/sdm660-common/proprietary/system/lib/libwfdrtsp.so
deleted file mode 100644
index 058b90a..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdrtsp.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdservice.so b/sdm660-common/proprietary/system/lib/libwfdservice.so
deleted file mode 100644
index 8987f55..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdservice.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfdsm.so b/sdm660-common/proprietary/system/lib/libwfdsm.so
deleted file mode 100644
index 52f559f..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfdsm.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfduibcsink.so b/sdm660-common/proprietary/system/lib/libwfduibcsink.so
deleted file mode 100644
index 7de08ad..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfduibcsink.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfduibcsinkinterface.so b/sdm660-common/proprietary/system/lib/libwfduibcsinkinterface.so
deleted file mode 100644
index 0af4645..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfduibcsinkinterface.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfduibcsrc.so b/sdm660-common/proprietary/system/lib/libwfduibcsrc.so
deleted file mode 100644
index 803a811..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfduibcsrc.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib/libwfduibcsrcinterface.so b/sdm660-common/proprietary/system/lib/libwfduibcsrcinterface.so
deleted file mode 100644
index 169055a..0000000
Binary files a/sdm660-common/proprietary/system/lib/libwfduibcsrcinterface.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib64/libwfdclient.so b/sdm660-common/proprietary/system/lib64/libwfdclient.so
deleted file mode 100644
index 98e8c23..0000000
Binary files a/sdm660-common/proprietary/system/lib64/libwfdclient.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/lib64/libwfdnative.so b/sdm660-common/proprietary/system/lib64/libwfdnative.so
deleted file mode 100644
index dbf6bcc..0000000
Binary files a/sdm660-common/proprietary/system/lib64/libwfdnative.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system/priv-app/WfdService/WfdService.apk b/sdm660-common/proprietary/system/priv-app/WfdService/WfdService.apk
deleted file mode 100644
index bd56dde..0000000
Binary files a/sdm660-common/proprietary/system/priv-app/WfdService/WfdService.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/ConfURIDialer/ConfURIDialer.apk b/sdm660-common/proprietary/system_ext/app/ConfURIDialer/ConfURIDialer.apk
new file mode 100644
index 0000000..cf3da11
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/ConfURIDialer/ConfURIDialer.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/ConferenceDialer/ConferenceDialer.apk b/sdm660-common/proprietary/system_ext/app/ConferenceDialer/ConferenceDialer.apk
new file mode 100644
index 0000000..f69c25f
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/ConferenceDialer/ConferenceDialer.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk b/sdm660-common/proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk
index ab4aa05..4046079 100644
Binary files a/sdm660-common/proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk and b/sdm660-common/proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk b/sdm660-common/proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk
new file mode 100644
index 0000000..f9ae9a7
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk b/sdm660-common/proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk
new file mode 100644
index 0000000..73c63ec
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/NetworkSetting/NetworkSetting.apk b/sdm660-common/proprietary/system_ext/app/NetworkSetting/NetworkSetting.apk
new file mode 100644
index 0000000..faa189b
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/NetworkSetting/NetworkSetting.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/QTIDiagServices/QTIDiagServices.apk b/sdm660-common/proprietary/system_ext/app/QTIDiagServices/QTIDiagServices.apk
new file mode 100644
index 0000000..7f73da2
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/QTIDiagServices/QTIDiagServices.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk b/sdm660-common/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
index 1481d55..3452eb0 100644
Binary files a/sdm660-common/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk and b/sdm660-common/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/SimContact/SimContact.apk b/sdm660-common/proprietary/system_ext/app/SimContact/SimContact.apk
new file mode 100644
index 0000000..75614e0
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/SimContact/SimContact.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/SimSettings/SimSettings.apk b/sdm660-common/proprietary/system_ext/app/SimSettings/SimSettings.apk
new file mode 100644
index 0000000..4f38998
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/SimSettings/SimSettings.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/atfwd/atfwd.apk b/sdm660-common/proprietary/system_ext/app/atfwd/atfwd.apk
new file mode 100644
index 0000000..b254d91
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/atfwd/atfwd.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk b/sdm660-common/proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk
index 759c585..a483f23 100644
Binary files a/sdm660-common/proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk and b/sdm660-common/proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/embms/embms.apk b/sdm660-common/proprietary/system_ext/app/embms/embms.apk
index e61b0c1..1e63722 100644
Binary files a/sdm660-common/proprietary/system_ext/app/embms/embms.apk and b/sdm660-common/proprietary/system_ext/app/embms/embms.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/imssettings/imssettings.apk b/sdm660-common/proprietary/system_ext/app/imssettings/imssettings.apk
index b5f51d6..0937147 100644
Binary files a/sdm660-common/proprietary/system_ext/app/imssettings/imssettings.apk and b/sdm660-common/proprietary/system_ext/app/imssettings/imssettings.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk b/sdm660-common/proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk
new file mode 100644
index 0000000..c38e874
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk b/sdm660-common/proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk
new file mode 100644
index 0000000..98a68a5
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/uceShimService/uceShimService.apk b/sdm660-common/proprietary/system_ext/app/uceShimService/uceShimService.apk
new file mode 100644
index 0000000..3d44f0c
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/uceShimService/uceShimService.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk b/sdm660-common/proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk
new file mode 100644
index 0000000..5890d50
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk b/sdm660-common/proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk
new file mode 100644
index 0000000..c2da079
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk b/sdm660-common/proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk
new file mode 100644
index 0000000..36b52f4
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk b/sdm660-common/proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk
new file mode 100644
index 0000000..fd2fabd
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/xdivert/xdivert.apk b/sdm660-common/proprietary/system_ext/app/xdivert/xdivert.apk
new file mode 100644
index 0000000..2688cf2
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/xdivert/xdivert.apk differ
diff --git a/sdm660-common/proprietary/system_ext/bin/diag_callback_sample_system b/sdm660-common/proprietary/system_ext/bin/diag_callback_sample_system
new file mode 100755
index 0000000..9628d06
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/bin/diag_callback_sample_system differ
diff --git a/sdm660-common/proprietary/system_ext/bin/diag_dci_sample_system b/sdm660-common/proprietary/system_ext/bin/diag_dci_sample_system
new file mode 100755
index 0000000..6b36a7c
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/bin/diag_dci_sample_system differ
diff --git a/sdm660-common/proprietary/system_ext/bin/diag_mdlog_system b/sdm660-common/proprietary/system_ext/bin/diag_mdlog_system
new file mode 100755
index 0000000..e5c1c98
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/bin/diag_mdlog_system differ
diff --git a/sdm660-common/proprietary/system_ext/bin/dpmd b/sdm660-common/proprietary/system_ext/bin/dpmd
index b33d4b8..67ef7a6 100755
Binary files a/sdm660-common/proprietary/system_ext/bin/dpmd and b/sdm660-common/proprietary/system_ext/bin/dpmd differ
diff --git a/sdm660-common/proprietary/system_ext/bin/test_diag_system b/sdm660-common/proprietary/system_ext/bin/test_diag_system
new file mode 100755
index 0000000..a4efd6d
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/bin/test_diag_system differ
diff --git a/sdm660-common/proprietary/system_ext/etc/cdma_call_conf.xml b/sdm660-common/proprietary/system_ext/etc/cdma_call_conf.xml
new file mode 100644
index 0000000..dd4b96c
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/cdma_call_conf.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (c) 2013,2015-2016 Qualcomm Technologies, Inc.
+** All Rights Reserved.
+** Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+-->
+
+<!-- If you edit this version, also edit the version in the partner-supplied
+    cdma_call_conf.xml configuration file -->
+<calloptions version="1">
+
+    <!--Call Forwarding Unconditional(CFU) -->
+    <!-- activation code for other number -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*72"
+         type="0"
+         category="1"
+         state="1"
+    />
+    <!-- de-activation code for other number -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*720"
+         type="0"
+         category="1"
+         state="0"
+    />
+    <!--activation code for voicemail -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*72"
+         type="0"
+         category="2"
+         state="1"
+    />
+    <!-- de-activation code for voicemail -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*720"
+         type="0"
+         category="2"
+         state="0"
+    />
+
+    <!-- Call Forwarding Busy(CFB)-->
+    <!-- activation code for other number -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*90"
+         type="1"
+         category="1"
+         state="1"
+    />
+    <!-- de-activation code for other number -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*900"
+         type="1"
+         category="1"
+         state="0"
+    />
+    <!--activation code for voicemail -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*90"
+         type="1"
+         category="2"
+         state="1"
+    />
+    <!-- de-activation code for voicemail -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*900"
+         type="1"
+         category="2"
+         state="0"
+    />
+
+    <!-- Call Forwarding Not Reachable(CFNR)-->
+    <!-- activation code for other number -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*68"
+         type="3"
+         category="1"
+         state="1"
+    />
+    <!-- de-activation code for other number -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*680"
+         type="3"
+         category="1"
+         state="0"
+    />
+    <!--activation code for voicemail -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*68"
+         type="3"
+         category="2"
+         state="1"
+    />
+    <!-- de-activation code for voicemail -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*680"
+         type="3"
+         category="2"
+         state="0"
+    />
+    <!-- Call Forwarding Not Answer(CFNA)-->
+    <!-- activation code for other number -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*92"
+         type="2"
+         category="1"
+         state="1"
+    />
+    <!-- de-activation code for other number -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*920"
+         type="2"
+         category="1"
+         state="0"
+    />
+    <!--activation code for voicemail -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*92"
+         type="2"
+         category="2"
+         state="1"
+    />
+    <!-- de-activation code for voicemail -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*920"
+         type="2"
+         category="2"
+         state="0"
+    />
+
+    <!-- De-activate all CF Service -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*730"
+         type="4"
+         category="1"
+         state="0"
+    />
+
+    <!-- Call waiting -->
+    <!-- Activate call waiting -->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*74"
+         type="6"
+         state="1"
+    />
+    <!-- Deactivate call waiting-->
+    <option carrier="China Telecom"
+         mcc="460"
+         mnc="03"
+         number="*740"
+         type="6"
+         state="0"
+    />
+    <!-- End of China Telecom -->
+</calloptions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml b/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml
new file mode 100644
index 0000000..e3dfa1b
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2017, 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<permissions>
+ <library name="com.qualcomm.qti.remoteSimlock.uimremotesimlocklibrary"
+          file="/system_ext/framework/uimremotesimlocklibrary.jar"/>
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml b/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml
new file mode 100644
index 0000000..ac1bfb4
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2016, 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<permissions>
+ <library name="com.qualcomm.qti.remoteSimlock.manager.remotesimlockmanagerlibrary"
+          file="/system_ext/framework/remotesimlockmanagerlibrary.jar"
+          dependency="com.qualcomm.qti.remoteSimlock.uimremotesimlocklibrary"/>
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml b/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml
new file mode 100644
index 0000000..159bd77
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2014, 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+<permissions>
+ <library name="com.qualcomm.qti.uimGba.uimgbalibrary"
+          file="/system_ext/framework/uimgbalibrary.jar"/>
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml b/sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml
new file mode 100644
index 0000000..749da23
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+<permissions>
+ <library name="com.qualcomm.qti.uimGbaManager.uimgbamanagerlibrary"
+          file="/system_ext/framework/uimgbamanagerlibrary.jar"
+          dependency="com.qualcomm.qti.uimGba.uimgbalibrary"/>
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml b/sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml
new file mode 100644
index 0000000..6d8ad89
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2017, 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<permissions>
+ <library name="com.qualcomm.qti.uim.uimservicelibrary"
+          file="/system_ext/framework/uimservicelibrary.jar"
+          dependency="qti-telephony-hidl-wrapper"/>
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml b/sdm660-common/proprietary/system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml
new file mode 100644
index 0000000..c7d2f8e
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml
@@ -0,0 +1,42 @@
+<?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.qti.ltebc">
+        <permission name="android.permission.SEND_EMBMS_INTENTS"/>
+    </privapp-permissions>
+
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml b/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml
new file mode 100644
index 0000000..04d0399
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2016, 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<permissions>
+ <library name="com.qualcomm.qti.lpa.uimlpalibrary"
+          file="/system_ext/framework/uimlpalibrary.jar"/>
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml b/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml
new file mode 100644
index 0000000..acc03be
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2014, 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Qualcomm Technologies Proprietary and Confidential.
+-->
+
+<permissions>
+ <library name="com.qualcomm.uimremoteclientlibrary"
+          file="/system_ext/framework/uimremoteclientlibrary.jar"/>
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml b/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml
new file mode 100644
index 0000000..0626f80
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2014, 2019 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Qualcomm Technologies Proprietary and Confidential.
+-->
+
+
+<permissions>
+ <library name="com.qualcomm.uimremoteserverlibrary"
+          file="/system_ext/framework/uimremoteserverlibrary.jar"/>
+</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/spn-conf.xml b/sdm660-common/proprietary/system_ext/etc/spn-conf.xml
new file mode 100644
index 0000000..6eb20b8
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/spn-conf.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2013,2016, Qualcomm Technologies, Inc.
+ * All Rights Reserved.
+ * Confidential and Proprietary - Qualcomm Technologies, Inc.
+ */
+-->
+<spnOverrides>
+    <!-- China -->
+    <spnOverride numeric="46000" spn="China Mobile" />
+    <spnOverride numeric="46001" spn="China Unicom" />
+    <spnOverride numeric="46002" spn="China Mobile" />
+    <spnOverride numeric="46003" spn="China Telecom" />
+    <spnOverride numeric="46005" spn="China Telecom" />
+    <spnOverride numeric="46006" spn="China Unicom" />
+    <spnOverride numeric="46007" spn="China Mobile" />
+    <!-- Taiwan -->
+    <spnOverride numeric="46601" spn="FarEasTone" />
+    <spnOverride numeric="46605" spn="APBW" />
+    <spnOverride numeric="46606" spn="Tuntex" />
+    <spnOverride numeric="46688" spn="KG Telecom" />
+    <spnOverride numeric="46689" spn="VIBO" />
+    <spnOverride numeric="46692" spn="Chungwa" />
+    <spnOverride numeric="46693" spn="MobiTai" />
+    <spnOverride numeric="46697" spn="Taiwan Mobile" />
+    <spnOverride numeric="46699" spn="TransAsia" />
+    <!--Hong Kong -->
+    <spnOverride numeric="45429" spn="PCCW" />
+    <spnOverride numeric="45404" spn="Hutchison"  />
+    <spnOverride numeric="45406" spn="Smartone"  />
+</spnOverrides>
diff --git a/sdm660-common/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml b/sdm660-common/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
new file mode 100644
index 0000000..59c3f63
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<!--
+/* Copyright (c) 2017-2018, 2020 The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of The Linux Foundation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-->
+
+<config>
+<!-- Broadcast actions that are currently whitelisted. -->
+<allow-implicit-broadcast action="org.codeaurora.intent.action.CALL_COMPOSER_INFO" />
+</config>
diff --git a/sdm660-common/proprietary/system_ext/framework/ActivityExt.jar b/sdm660-common/proprietary/system_ext/framework/ActivityExt.jar
new file mode 100644
index 0000000..974b9be
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/ActivityExt.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.qti.dpmframework.jar b/sdm660-common/proprietary/system_ext/framework/com.qti.dpmframework.jar
index 51725a4..d50257a 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.qti.dpmframework.jar and b/sdm660-common/proprietary/system_ext/framework/com.qti.dpmframework.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar
index 95ddd7e..583da0f 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar
index 13bec29..b354a36 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar
index a9e34c5..b9eb638 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar
index 5e0651d..5c7abd9 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar
index 0927d01..22cb723 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.2-java.jar b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.2-java.jar
new file mode 100644
index 0000000..debeaa4
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.2-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.3-java.jar b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.3-java.jar
new file mode 100644
index 0000000..6d27851
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.3-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.0-java.jar
new file mode 100644
index 0000000..ec0bb75
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.1-java.jar
index a323b0c..666b2e6 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.1-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar
index 8c1f41d..46ca207 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar
index 5f0a133..70a30e1 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.1-java.jar b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.1-java.jar
index 0b90d9b..014dce0 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.1-java.jar and b/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/dpmapi.jar b/sdm660-common/proprietary/system_ext/framework/dpmapi.jar
index c750658..59cf9bf 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/dpmapi.jar and b/sdm660-common/proprietary/system_ext/framework/dpmapi.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/embmslibrary.jar b/sdm660-common/proprietary/system_ext/framework/embmslibrary.jar
index 4a031c9..d627365 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/embmslibrary.jar and b/sdm660-common/proprietary/system_ext/framework/embmslibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/qcrilhook.jar b/sdm660-common/proprietary/system_ext/framework/qcrilhook.jar
index 5366ad5..ee82015 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/qcrilhook.jar and b/sdm660-common/proprietary/system_ext/framework/qcrilhook.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/qti-telephony-common.jar b/sdm660-common/proprietary/system_ext/framework/qti-telephony-common.jar
index 95bb1da..c8013b2 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/qti-telephony-common.jar and b/sdm660-common/proprietary/system_ext/framework/qti-telephony-common.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/remotesimlockmanagerlibrary.jar b/sdm660-common/proprietary/system_ext/framework/remotesimlockmanagerlibrary.jar
new file mode 100644
index 0000000..7c4b203
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/remotesimlockmanagerlibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimgbalibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimgbalibrary.jar
new file mode 100644
index 0000000..cc681ec
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/uimgbalibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimgbamanagerlibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimgbamanagerlibrary.jar
new file mode 100644
index 0000000..368acf1
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/uimgbamanagerlibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimlpalibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimlpalibrary.jar
new file mode 100644
index 0000000..bd797fd
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/uimlpalibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimremoteclientlibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimremoteclientlibrary.jar
new file mode 100644
index 0000000..ba84ee8
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/uimremoteclientlibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimremoteserverlibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimremoteserverlibrary.jar
new file mode 100644
index 0000000..9b82b44
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/uimremoteserverlibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimremotesimlocklibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimremotesimlocklibrary.jar
new file mode 100644
index 0000000..f929157
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/uimremotesimlocklibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimservicelibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimservicelibrary.jar
new file mode 100644
index 0000000..e777dbb
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/uimservicelibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V1.0-java.jar
new file mode 100644
index 0000000..2844a33
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.0-java.jar
new file mode 100644
index 0000000..50ca843
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.1-java.jar
new file mode 100644
index 0000000..ad56773
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.2-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.2-java.jar
new file mode 100644
index 0000000..adc42a9
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.2-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.3-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.3-java.jar
new file mode 100644
index 0000000..e687672
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.3-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.mwqem-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.mwqem-V1.0-java.jar
new file mode 100644
index 0000000..3a9c5bb
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.mwqem-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.slm-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.slm-V1.0-java.jar
new file mode 100644
index 0000000..233bd63
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.slm-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar
index 9cf7e8d..563f518 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar
index 8cf761e..adec176 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.0-java.jar
new file mode 100644
index 0000000..0c94603
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar
index 588f7f3..17d60e3 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar
index bfadbe8..acbfe4d 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar
index 7e10a3c..5e2bb40 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar
index c124ed1..040a07f 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.latency-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.latency-V1.0-java.jar
new file mode 100644
index 0000000..7a118cb
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.latency-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.lce-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.lce-V1.0-java.jar
new file mode 100644
index 0000000..27424ff
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.lce-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar
index cc3a5a5..2eb4dc4 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.mwqemadapter-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.mwqemadapter-V1.0-java.jar
new file mode 100644
index 0000000..2ab4010
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.mwqemadapter-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.slmadapter-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.slmadapter-V1.0-java.jar
new file mode 100644
index 0000000..70bb0bc
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.slmadapter-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar
index 98bb741..12d384d 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar
index d121588..757e8de 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.0-java.jar
new file mode 100644
index 0000000..97e58f9
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar
new file mode 100644
index 0000000..e392082
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar
index 6146efd..2519ff6 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar
new file mode 100644
index 0000000..7debc6e
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.0-java.jar
new file mode 100644
index 0000000..840c8d5
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.1-java.jar
new file mode 100644
index 0000000..65cbb88
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.0-java.jar
new file mode 100644
index 0000000..43fd83f
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.0-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar
new file mode 100644
index 0000000..a3ab5f7
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar differ
diff --git a/sdm660-common/proprietary/system_ext/lib/libmmosal.so b/sdm660-common/proprietary/system_ext/lib/libmmosal.so
new file mode 100644
index 0000000..ef81afa
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib/libmmosal.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib/libmmparser_lite.so b/sdm660-common/proprietary/system_ext/lib/libmmparser_lite.so
new file mode 100644
index 0000000..03ec180
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib/libmmparser_lite.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so
index 8fd7218..6faae8f 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so
index ab0ffd2..2fd3414 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so
index 502d53f..13314bc 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so
index 2939b01..b70036d 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so
index c4151f8..e0652c4 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so
index 5085996..aa6365f 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so
index b141d14..b2fa609 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so
index 91ea774..debc051 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so
new file mode 100644
index 0000000..274d64e
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so
index 57fe772..d98012c 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so
index 76516cd..ca55865 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so and b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so
index 9317336..8dda33b 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so
index 0977375..861eb55 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so and b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so
index 87b94c9..86c2547 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so and b/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/fm_helium.so b/sdm660-common/proprietary/system_ext/lib64/fm_helium.so
new file mode 100644
index 0000000..bdecb62
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/fm_helium.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/lib-imsvideocodec.so b/sdm660-common/proprietary/system_ext/lib64/lib-imsvideocodec.so
index 9dbceb8..45f1e4e 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/lib-imsvideocodec.so and b/sdm660-common/proprietary/system_ext/lib64/lib-imsvideocodec.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/lib-imsvt.so b/sdm660-common/proprietary/system_ext/lib64/lib-imsvt.so
index f29697d..aad791b 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/lib-imsvt.so and b/sdm660-common/proprietary/system_ext/lib64/lib-imsvt.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/lib-imsvtextutils.so b/sdm660-common/proprietary/system_ext/lib64/lib-imsvtextutils.so
index 410476e..8cdf45c 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/lib-imsvtextutils.so and b/sdm660-common/proprietary/system_ext/lib64/lib-imsvtextutils.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/lib-imsvtutils.so b/sdm660-common/proprietary/system_ext/lib64/lib-imsvtutils.so
index 4feaede..4d39945 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/lib-imsvtutils.so and b/sdm660-common/proprietary/system_ext/lib64/lib-imsvtutils.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libDiagService.so b/sdm660-common/proprietary/system_ext/lib64/libDiagService.so
new file mode 100644
index 0000000..fe5f123
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libDiagService.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libdiag_system.qti.so b/sdm660-common/proprietary/system_ext/lib64/libdiag_system.qti.so
new file mode 100644
index 0000000..74fc4ca
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libdiag_system.qti.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libdiag_system.so b/sdm660-common/proprietary/system_ext/lib64/libdiag_system.so
index fb01552..b9f286d 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libdiag_system.so and b/sdm660-common/proprietary/system_ext/lib64/libdiag_system.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libdpmctmgr.so b/sdm660-common/proprietary/system_ext/lib64/libdpmctmgr.so
index 1550016..bd56948 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libdpmctmgr.so and b/sdm660-common/proprietary/system_ext/lib64/libdpmctmgr.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libdpmfdmgr.so b/sdm660-common/proprietary/system_ext/lib64/libdpmfdmgr.so
index 5fc9eef..b87be44 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libdpmfdmgr.so and b/sdm660-common/proprietary/system_ext/lib64/libdpmfdmgr.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libdpmframework.so b/sdm660-common/proprietary/system_ext/lib64/libdpmframework.so
index 9e832a1..363433a 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libdpmframework.so and b/sdm660-common/proprietary/system_ext/lib64/libdpmframework.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libdpmtcm.so b/sdm660-common/proprietary/system_ext/lib64/libdpmtcm.so
index b0d108b..4ced611 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libdpmtcm.so and b/sdm660-common/proprietary/system_ext/lib64/libdpmtcm.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libembmsmmosal.so b/sdm660-common/proprietary/system_ext/lib64/libembmsmmosal.so
new file mode 100644
index 0000000..884a12e
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libembmsmmosal.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libembmsmmparser_lite.so b/sdm660-common/proprietary/system_ext/lib64/libembmsmmparser_lite.so
new file mode 100644
index 0000000..4ae7ab0
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libembmsmmparser_lite.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libembmssqlite.so b/sdm660-common/proprietary/system_ext/lib64/libembmssqlite.so
new file mode 100644
index 0000000..78c1c95
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libembmssqlite.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libembmstinyxml.so b/sdm660-common/proprietary/system_ext/lib64/libembmstinyxml.so
new file mode 100644
index 0000000..9c4f142
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libembmstinyxml.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libfm-hci.so b/sdm660-common/proprietary/system_ext/lib64/libfm-hci.so
new file mode 100644
index 0000000..51eee20
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libfm-hci.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libimscamera_jni.so b/sdm660-common/proprietary/system_ext/lib64/libimscamera_jni.so
index 31aa61d..a0116af 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libimscamera_jni.so and b/sdm660-common/proprietary/system_ext/lib64/libimscamera_jni.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libimsmedia_jni.so b/sdm660-common/proprietary/system_ext/lib64/libimsmedia_jni.so
index 366c9f9..18b66b8 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libimsmedia_jni.so and b/sdm660-common/proprietary/system_ext/lib64/libimsmedia_jni.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libjnihelpers.so b/sdm660-common/proprietary/system_ext/lib64/libjnihelpers.so
new file mode 100644
index 0000000..833c8bf
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libjnihelpers.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so b/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so
new file mode 100644
index 0000000..5c02cbf
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so b/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so
new file mode 100644
index 0000000..512b844
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmmosal.so b/sdm660-common/proprietary/system_ext/lib64/libmmosal.so
new file mode 100644
index 0000000..78cfa77
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libmmosal.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmmparser_lite.so b/sdm660-common/proprietary/system_ext/lib64/libmmparser_lite.so
new file mode 100644
index 0000000..9ef9ff6
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libmmparser_lite.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmmrtpdecoder.so b/sdm660-common/proprietary/system_ext/lib64/libmmrtpdecoder.so
new file mode 100644
index 0000000..50d304b
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libmmrtpdecoder.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmmrtpencoder.so b/sdm660-common/proprietary/system_ext/lib64/libmmrtpencoder.so
new file mode 100644
index 0000000..2cba095
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libmmrtpencoder.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmsp.so b/sdm660-common/proprietary/system_ext/lib64/libmsp.so
new file mode 100644
index 0000000..2d50cb0
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libmsp.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmwqemiptablemgr.so b/sdm660-common/proprietary/system_ext/lib64/libmwqemiptablemgr.so
new file mode 100644
index 0000000..7cdf219
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libmwqemiptablemgr.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libqmi_cci_system.so b/sdm660-common/proprietary/system_ext/lib64/libqmi_cci_system.so
new file mode 100644
index 0000000..d2de64d
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libqmi_cci_system.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libqmi_encdec_system.so b/sdm660-common/proprietary/system_ext/lib64/libqmi_encdec_system.so
new file mode 100644
index 0000000..90dbfcd
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libqmi_encdec_system.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libtrigger-handler.so b/sdm660-common/proprietary/system_ext/lib64/libtrigger-handler.so
new file mode 100644
index 0000000..61e7adc
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libtrigger-handler.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libupdateprof.qti.so b/sdm660-common/proprietary/system_ext/lib64/libupdateprof.qti.so
new file mode 100644
index 0000000..9d8680c
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/libupdateprof.qti.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@1.0.so
new file mode 100644
index 0000000..abbc112
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.0.so
new file mode 100644
index 0000000..36843c5
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.1.so
new file mode 100644
index 0000000..9c8150f
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.2.so
new file mode 100644
index 0000000..3874e7a
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.2.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.3.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.3.so
new file mode 100644
index 0000000..b6eac86
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.3.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.mwqem@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.mwqem@1.0.so
new file mode 100644
index 0000000..8d96bfc
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.mwqem@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.slm@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.slm@1.0.so
new file mode 100644
index 0000000..3d54d7c
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.slm@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so
index 88038c0..710ab50 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so
index e4097be..2420c17 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so
index b31ab64..9ff13bd 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so
index 59b4f30..811786f 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.0.so
index 3e164f9..bf47b3c 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.1.so
index f31ac05..0f2ff7c 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.1.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so
index fc74184..c3d3e6a 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.iwlan@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.iwlan@1.0.so
index a65c3c6..22cd040 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.iwlan@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.iwlan@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.latency@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.latency@1.0.so
new file mode 100644
index 0000000..dcfd8b1
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.latency@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.lce@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.lce@1.0.so
new file mode 100644
index 0000000..5fad6ae
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.lce@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.qmi@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.qmi@1.0.so
index 5aac4d5..6b606ac 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.qmi@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.qmi@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so
new file mode 100644
index 0000000..8d03a70
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so
new file mode 100644
index 0000000..9236a47
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so
new file mode 100644
index 0000000..c023fa7
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so
new file mode 100644
index 0000000..154b6e2
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so
new file mode 100644
index 0000000..08a3ef2
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.mwqemadapter@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.mwqemadapter@1.0.so
new file mode 100644
index 0000000..8d21e6e
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.mwqemadapter@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.am@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.am@1.0.so
new file mode 100644
index 0000000..19debdf
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.am@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so
new file mode 100644
index 0000000..f275d5f
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so
new file mode 100644
index 0000000..37098e7
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so
new file mode 100644
index 0000000..cd86b80
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so
new file mode 100644
index 0000000..86be1fb
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so
new file mode 100644
index 0000000..b8d6b07
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.5.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.5.so
new file mode 100644
index 0000000..afa230d
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.5.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.6.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.6.so
new file mode 100644
index 0000000..15e767a
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.6.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so
new file mode 100644
index 0000000..75b5c7b
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so
new file mode 100644
index 0000000..deec6c1
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.0.so
new file mode 100644
index 0000000..b2f2e4d
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.1.so
new file mode 100644
index 0000000..4bc3c08
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so
new file mode 100644
index 0000000..aea70eb
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so
new file mode 100644
index 0000000..6dbfed2
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so
new file mode 100644
index 0000000..464b0fd
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so
new file mode 100644
index 0000000..5f00787
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so
new file mode 100644
index 0000000..0597977
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so
new file mode 100644
index 0000000..376e862
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so
new file mode 100644
index 0000000..92a2426
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so
new file mode 100644
index 0000000..c127fb5
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so
new file mode 100644
index 0000000..42beaf0
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.0.so
new file mode 100644
index 0000000..6b43993
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.1.so
new file mode 100644
index 0000000..a45fb6b
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.2.so
new file mode 100644
index 0000000..1575147
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.2.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so
new file mode 100644
index 0000000..53db0f9
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so
new file mode 100644
index 0000000..6745adc
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so
new file mode 100644
index 0000000..57b90e8
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so
new file mode 100644
index 0000000..74fc167
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.slmadapter@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.slmadapter@1.0.so
new file mode 100644
index 0000000..ce5d66a
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.slmadapter@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callcapability@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callcapability@1.0.so
index cc32b06..a99f437 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callcapability@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callcapability@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so
index b1cefd7..8bfc845 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so
index 41e0cbc..7f0e9d3 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.1.so
new file mode 100644
index 0000000..2a30f03
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so
index f2fb16d..ded9d59 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.1.so
new file mode 100644
index 0000000..c13ec3b
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.0.so
new file mode 100644
index 0000000..de1a088
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.1.so
new file mode 100644
index 0000000..dfd872b
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so
index fcd7d4c..2052afa 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.0.so
new file mode 100644
index 0000000..696ab6f
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.0.so differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so
new file mode 100644
index 0000000..ec49ab5
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so differ
diff --git a/sdm660-common/proprietary/system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk b/sdm660-common/proprietary/system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk
new file mode 100644
index 0000000..721587d
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk differ
diff --git a/sdm660-common/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk b/sdm660-common/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
index 273a53c..869bd1b 100644
Binary files a/sdm660-common/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk and b/sdm660-common/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk differ
diff --git a/sdm660-common/proprietary/system_ext/priv-app/ims/ims.apk b/sdm660-common/proprietary/system_ext/priv-app/ims/ims.apk
index 73eac14..37a88fb 100644
Binary files a/sdm660-common/proprietary/system_ext/priv-app/ims/ims.apk and b/sdm660-common/proprietary/system_ext/priv-app/ims/ims.apk differ
diff --git a/sdm660-common/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/sdm660-common/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
index 7112bdb..d5ee58e 100644
Binary files a/sdm660-common/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk and b/sdm660-common/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk differ
diff --git a/sdm660-common/proprietary/vendor/app/CACertService/CACertService.apk b/sdm660-common/proprietary/vendor/app/CACertService/CACertService.apk
new file mode 100644
index 0000000..7759e9a
Binary files /dev/null and b/sdm660-common/proprietary/vendor/app/CACertService/CACertService.apk differ
diff --git a/sdm660-common/proprietary/vendor/app/CneApp/CneApp.apk b/sdm660-common/proprietary/vendor/app/CneApp/CneApp.apk
index 55cc45a..3a6198f 100644
Binary files a/sdm660-common/proprietary/vendor/app/CneApp/CneApp.apk and b/sdm660-common/proprietary/vendor/app/CneApp/CneApp.apk differ
diff --git a/sdm660-common/proprietary/vendor/app/IWlanService/IWlanService.apk b/sdm660-common/proprietary/vendor/app/IWlanService/IWlanService.apk
index ceb2f3d..232ed0e 100644
Binary files a/sdm660-common/proprietary/vendor/app/IWlanService/IWlanService.apk and b/sdm660-common/proprietary/vendor/app/IWlanService/IWlanService.apk differ
diff --git a/sdm660-common/proprietary/vendor/app/QCC-TR-UI/QCC-TR-UI.apk b/sdm660-common/proprietary/vendor/app/QCC-TR-UI/QCC-TR-UI.apk
new file mode 100644
index 0000000..891b84c
Binary files /dev/null and b/sdm660-common/proprietary/vendor/app/QCC-TR-UI/QCC-TR-UI.apk differ
diff --git a/sdm660-common/proprietary/vendor/app/TimeService/TimeService.apk b/sdm660-common/proprietary/vendor/app/TimeService/TimeService.apk
index 7940791..23488f4 100644
Binary files a/sdm660-common/proprietary/vendor/app/TimeService/TimeService.apk and b/sdm660-common/proprietary/vendor/app/TimeService/TimeService.apk differ
diff --git a/sdm660-common/proprietary/vendor/bin/ATFWD-daemon b/sdm660-common/proprietary/vendor/bin/ATFWD-daemon
index e1b6aa7..e982f3c 100755
Binary files a/sdm660-common/proprietary/vendor/bin/ATFWD-daemon and b/sdm660-common/proprietary/vendor/bin/ATFWD-daemon differ
diff --git a/sdm660-common/proprietary/vendor/bin/adpl b/sdm660-common/proprietary/vendor/bin/adpl
index a044bfb..7d83bd6 100755
Binary files a/sdm660-common/proprietary/vendor/bin/adpl and b/sdm660-common/proprietary/vendor/bin/adpl differ
diff --git a/sdm660-common/proprietary/vendor/bin/cnd b/sdm660-common/proprietary/vendor/bin/cnd
index f942413..d85531d 100755
Binary files a/sdm660-common/proprietary/vendor/bin/cnd and b/sdm660-common/proprietary/vendor/bin/cnd differ
diff --git a/sdm660-common/proprietary/vendor/bin/dpmQmiMgr b/sdm660-common/proprietary/vendor/bin/dpmQmiMgr
index fbb79b9..d7e76a9 100755
Binary files a/sdm660-common/proprietary/vendor/bin/dpmQmiMgr and b/sdm660-common/proprietary/vendor/bin/dpmQmiMgr differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti b/sdm660-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
index 269fb4d..6476004 100644
Binary files a/sdm660-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti and b/sdm660-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/qcrild b/sdm660-common/proprietary/vendor/bin/hw/qcrild
index a2e723a..96e69be 100644
Binary files a/sdm660-common/proprietary/vendor/bin/hw/qcrild and b/sdm660-common/proprietary/vendor/bin/hw/qcrild differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service
deleted file mode 100644
index d614c4e..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.1-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.1-service
new file mode 100644
index 0000000..e555e20
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.1-service differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
index 09d9c6b..ff4b0ce 100644
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service and b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service
new file mode 100644
index 0000000..a0381e8
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service
new file mode 100644
index 0000000..552f9f0
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service
index a9d4abe..3f43ecd 100644
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service and b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service
index 6d5106b..e23ec2d 100644
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service and b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti
index 3817205..f03cb97 100644
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti and b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti differ
diff --git a/sdm660-common/proprietary/vendor/bin/ims_rtp_daemon b/sdm660-common/proprietary/vendor/bin/ims_rtp_daemon
index cccf3f2..4504895 100755
Binary files a/sdm660-common/proprietary/vendor/bin/ims_rtp_daemon and b/sdm660-common/proprietary/vendor/bin/ims_rtp_daemon differ
diff --git a/sdm660-common/proprietary/vendor/bin/imsdatadaemon b/sdm660-common/proprietary/vendor/bin/imsdatadaemon
index 03ac76b..4fc3e81 100755
Binary files a/sdm660-common/proprietary/vendor/bin/imsdatadaemon and b/sdm660-common/proprietary/vendor/bin/imsdatadaemon differ
diff --git a/sdm660-common/proprietary/vendor/bin/imsqmidaemon b/sdm660-common/proprietary/vendor/bin/imsqmidaemon
index 01686a7..896b54c 100755
Binary files a/sdm660-common/proprietary/vendor/bin/imsqmidaemon and b/sdm660-common/proprietary/vendor/bin/imsqmidaemon differ
diff --git a/sdm660-common/proprietary/vendor/bin/imsrcsd b/sdm660-common/proprietary/vendor/bin/imsrcsd
index d06b0aa..82e3e58 100755
Binary files a/sdm660-common/proprietary/vendor/bin/imsrcsd and b/sdm660-common/proprietary/vendor/bin/imsrcsd differ
diff --git a/sdm660-common/proprietary/vendor/bin/ipacm-diag b/sdm660-common/proprietary/vendor/bin/ipacm-diag
new file mode 100755
index 0000000..bd104e0
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/ipacm-diag differ
diff --git a/sdm660-common/proprietary/vendor/bin/irsc_util b/sdm660-common/proprietary/vendor/bin/irsc_util
index 539fe2d..1790d91 100755
Binary files a/sdm660-common/proprietary/vendor/bin/irsc_util and b/sdm660-common/proprietary/vendor/bin/irsc_util differ
diff --git a/sdm660-common/proprietary/vendor/bin/mutualex b/sdm660-common/proprietary/vendor/bin/mutualex
new file mode 100755
index 0000000..378caa3
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/mutualex differ
diff --git a/sdm660-common/proprietary/vendor/bin/netmgrd b/sdm660-common/proprietary/vendor/bin/netmgrd
index 5f1d69d..e24504a 100755
Binary files a/sdm660-common/proprietary/vendor/bin/netmgrd and b/sdm660-common/proprietary/vendor/bin/netmgrd differ
diff --git a/sdm660-common/proprietary/vendor/bin/pd-mapper b/sdm660-common/proprietary/vendor/bin/pd-mapper
index 63940d0..dd31e74 100755
Binary files a/sdm660-common/proprietary/vendor/bin/pd-mapper and b/sdm660-common/proprietary/vendor/bin/pd-mapper differ
diff --git a/sdm660-common/proprietary/vendor/bin/port-bridge b/sdm660-common/proprietary/vendor/bin/port-bridge
index 036883c..e3258f3 100755
Binary files a/sdm660-common/proprietary/vendor/bin/port-bridge and b/sdm660-common/proprietary/vendor/bin/port-bridge differ
diff --git a/sdm660-common/proprietary/vendor/bin/power_off_alarm b/sdm660-common/proprietary/vendor/bin/power_off_alarm
new file mode 100755
index 0000000..2a3fc2e
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/power_off_alarm differ
diff --git a/sdm660-common/proprietary/vendor/bin/qcc-trd b/sdm660-common/proprietary/vendor/bin/qcc-trd
new file mode 100755
index 0000000..3cc3191
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/qcc-trd differ
diff --git a/sdm660-common/proprietary/vendor/bin/qmipriod b/sdm660-common/proprietary/vendor/bin/qmipriod
new file mode 100755
index 0000000..1656783
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/qmipriod differ
diff --git a/sdm660-common/proprietary/vendor/bin/qrtr-cfg b/sdm660-common/proprietary/vendor/bin/qrtr-cfg
index 9e31b65..3dd0ea1 100755
Binary files a/sdm660-common/proprietary/vendor/bin/qrtr-cfg and b/sdm660-common/proprietary/vendor/bin/qrtr-cfg differ
diff --git a/sdm660-common/proprietary/vendor/bin/qrtr-lookup b/sdm660-common/proprietary/vendor/bin/qrtr-lookup
index 97531f7..fc0697f 100755
Binary files a/sdm660-common/proprietary/vendor/bin/qrtr-lookup and b/sdm660-common/proprietary/vendor/bin/qrtr-lookup differ
diff --git a/sdm660-common/proprietary/vendor/bin/qrtr-ns b/sdm660-common/proprietary/vendor/bin/qrtr-ns
index 9703c0f..d3c3baf 100755
Binary files a/sdm660-common/proprietary/vendor/bin/qrtr-ns and b/sdm660-common/proprietary/vendor/bin/qrtr-ns differ
diff --git a/sdm660-common/proprietary/vendor/bin/qseecomd b/sdm660-common/proprietary/vendor/bin/qseecomd
index b9fbad2..beba734 100755
Binary files a/sdm660-common/proprietary/vendor/bin/qseecomd and b/sdm660-common/proprietary/vendor/bin/qseecomd differ
diff --git a/sdm660-common/proprietary/vendor/bin/qti b/sdm660-common/proprietary/vendor/bin/qti
index dbe75e5..c348e5e 100755
Binary files a/sdm660-common/proprietary/vendor/bin/qti and b/sdm660-common/proprietary/vendor/bin/qti differ
diff --git a/sdm660-common/proprietary/vendor/bin/rmt_storage b/sdm660-common/proprietary/vendor/bin/rmt_storage
index bfd3b7a..f83b656 100755
Binary files a/sdm660-common/proprietary/vendor/bin/rmt_storage and b/sdm660-common/proprietary/vendor/bin/rmt_storage differ
diff --git a/sdm660-common/proprietary/vendor/bin/ssgqmigd b/sdm660-common/proprietary/vendor/bin/ssgqmigd
new file mode 100755
index 0000000..3730b9f
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/ssgqmigd differ
diff --git a/sdm660-common/proprietary/vendor/bin/ssgtzd b/sdm660-common/proprietary/vendor/bin/ssgtzd
new file mode 100755
index 0000000..482bc63
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/ssgtzd differ
diff --git a/sdm660-common/proprietary/vendor/bin/tftp_server b/sdm660-common/proprietary/vendor/bin/tftp_server
index a04b316..23ace46 100755
Binary files a/sdm660-common/proprietary/vendor/bin/tftp_server and b/sdm660-common/proprietary/vendor/bin/tftp_server differ
diff --git a/sdm660-common/proprietary/vendor/bin/time_daemon b/sdm660-common/proprietary/vendor/bin/time_daemon
index 2df54dd..2b25dc7 100755
Binary files a/sdm660-common/proprietary/vendor/bin/time_daemon and b/sdm660-common/proprietary/vendor/bin/time_daemon differ
diff --git a/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision b/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision
new file mode 100755
index 0000000..f2ade3c
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision differ
diff --git a/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice b/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice
index 1b7cb0e..951894c 100755
Binary files a/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice and b/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice differ
diff --git a/sdm660-common/proprietary/vendor/etc/cne/mwqem.conf b/sdm660-common/proprietary/vendor/etc/cne/mwqem.conf
new file mode 100644
index 0000000..66cfede
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/cne/mwqem.conf
@@ -0,0 +1,17 @@
+#configuration parameters for Multi-network Wireless Quality Estimation and Management.
+
+#Number of previous latency iterations to track to decide the better LQS interface
+latency_count:3
+#Threshold in ms to decide the better interface for LQS.
+latency_threshold:10
+#Number of tcp connections to be established in each latency session
+max_tcp_connects:3
+#Max waiting time for a dns query to be resolved
+dns_timeout:9
+#Minimum change in mwqem ratio to update the new LQA ratio
+lqa_update_threshold:0.25
+#Timer in msec to track the lqs updates. Only one update will be allowed
+#in this duration
+lqa_update_count_timer:10000
+#default URL for establishing a tcp sessions
+mwqem_http_url:www.qualcomm.com
diff --git a/sdm660-common/proprietary/vendor/etc/cne/profileSlm.xml b/sdm660-common/proprietary/vendor/etc/cne/profileMwqem.xml
similarity index 100%
rename from sdm660-common/proprietary/vendor/etc/cne/profileSlm.xml
rename to sdm660-common/proprietary/vendor/etc/cne/profileMwqem.xml
diff --git a/sdm660-common/proprietary/vendor/etc/cne/slm.conf b/sdm660-common/proprietary/vendor/etc/cne/slm.conf
deleted file mode 100644
index 5bdf52d..0000000
--- a/sdm660-common/proprietary/vendor/etc/cne/slm.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#configuration parameters for Smart Link Management.
-
-#Number of previous latency iterations to track to decide the better SLS interface
-latency_count:3
-#Threshold in ms to decide the better interface for SLS.
-latency_threshold:10
-#Number of tcp connections to be established in each latency session
-max_tcp_connects:3
-#Max waiting time for a dns query to be resolved
-dns_timeout:9
-#Minimum change in slm ratio to update the new SLA ratio
-sla_update_threshold:0.25
-#Timer in msec to track the sls updates. Only one update will be allowed
-#in this duration
-sla_update_count_timer:10000
-#default URL for establishing a tcp sessions
-slm_http_url:www.qualcomm.com
\ No newline at end of file
diff --git a/sdm660-common/proprietary/vendor/etc/data/dsi_config.xml b/sdm660-common/proprietary/vendor/etc/data/dsi_config.xml
index f64eb6f..752ac43 100644
--- a/sdm660-common/proprietary/vendor/etc/data/dsi_config.xml
+++ b/sdm660-common/proprietary/vendor/etc/data/dsi_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      DSI Module configuration XML file
-     Copyright (c) 2013, 2015, 2017-2019 Qualcomm Technologies, Inc.
+     Copyright (c) 2013, 2015, 2017-2020 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
diff --git a/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml b/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml
index de659ea..2390b31 100644
--- a/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml
+++ b/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml
@@ -3116,6 +3116,7 @@
       <data name="rmnet_shs" type="int"> 1 </data>
       <data name="uplink_priority" type="int"> 1 </data>
       <data name="iwlan_concurrency" type="int"> 1 </data>
+      <data name="nl_xfrm" type="int"> 1 </data>
       <data name="netdev_max_backlog" type="int"> 100000 </data>
       <data name="debug_netdev_max_backlog" type="int"> 1500 </data>
 
diff --git a/sdm660-common/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml b/sdm660-common/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml
index 1d7f3b2..7e89700 100644
--- a/sdm660-common/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml
+++ b/sdm660-common/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml
@@ -13,6 +13,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
 
 <exceptions>
     <exception package="com.qualcomm.qti.cne">
+        <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
         <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
     </exception>
 </exceptions>
diff --git a/sdm660-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc b/sdm660-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
index 22b71f4..e75e2a7 100644
--- a/sdm660-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
@@ -1,5 +1,5 @@
 service vendor.bluetooth-1-0-qti /vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
     class hal
     user bluetooth
-    group bluetooth system wakelock oem_2901
+    group bluetooth system wakelock oem_2901 net_raw
     capabilities BLOCK_SUSPEND NET_ADMIN
diff --git a/sdm660-common/proprietary/vendor/etc/init/init-qcril-data.rc b/sdm660-common/proprietary/vendor/etc/init/init-qcril-data.rc
deleted file mode 100644
index 163e175..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/init-qcril-data.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-on property:ro.board.platform=msmnile && property:ro.baseband=msm && property:ro.vendor.qti.va_aosp.support=1
-  setprop ro.telephony.iwlan_operation_mode "legacy"
diff --git a/sdm660-common/proprietary/vendor/etc/init/init.qdmastats.rc b/sdm660-common/proprietary/vendor/etc/init/init.qdmastats.rc
new file mode 100644
index 0000000..120e8d1
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/init.qdmastats.rc
@@ -0,0 +1,16 @@
+# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+on post-fs-data
+    # create QDMA dropbox
+    mkdir /data/vendor/qdmastats 0700 system system
+    mkdir /data/vendor/qdma 0770 system system
+    #mkdir /dev/socket/qdma 0777 system system
+    #chmod 2777 /dev/socket/qdma
+
+service vendor.qcc-trd /system/vendor/bin/qcc-trd
+    class late_start
+    user system
+    group everybody readproc system net_bw_stats radio vendor_rfs_shared sdcard_rw media_rw sdcard_r
diff --git a/sdm660-common/proprietary/vendor/etc/init/ipa_fws.rc b/sdm660-common/proprietary/vendor/etc/init/ipa_fws.rc
deleted file mode 100644
index 0f8ba8a..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/ipa_fws.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-on early-boot
-write /dev/ipa 1
-
diff --git a/sdm660-common/proprietary/vendor/etc/init/ipacm-diag.rc b/sdm660-common/proprietary/vendor/etc/init/ipacm-diag.rc
new file mode 100644
index 0000000..19c6541
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/ipacm-diag.rc
@@ -0,0 +1,16 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+# msm specific files that need to be created on /data
+on post-fs-data
+	#create ipacm-diag log dir
+	mkdir /data/vendor/ipa 0770 radio radio
+	chmod 0770 /data/vendor/ipa
+
+service vendor.ipacm-diag /system/vendor/bin/ipacm-diag
+    class main
+    user radio
+    socket ipacm_log_file dgram 660 radio radio
+    group radio diag oem_2901
diff --git a/sdm660-common/proprietary/vendor/etc/init/mutualex.rc b/sdm660-common/proprietary/vendor/etc/init/mutualex.rc
new file mode 100644
index 0000000..f93172e
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/mutualex.rc
@@ -0,0 +1,6 @@
+service vendor.mutualex /vendor/bin/mutualex
+     class main
+     user radio
+     group radio wakelock wifi inet
+     capabilities BLOCK_SUSPEND
+     oneshot
diff --git a/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc b/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
index 47be52f..755090a 100644
--- a/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
+# Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
diff --git a/sdm660-common/proprietary/vendor/etc/init/qmipriod.debug.rc b/sdm660-common/proprietary/vendor/etc/init/qmipriod.debug.rc
new file mode 100644
index 0000000..1555a09
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/qmipriod.debug.rc
@@ -0,0 +1,7 @@
+# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+on boot
+    write /data/vendor/qmipriod/log.txt ""
+    chown radio radio /data/vendor/qmipriod/log.txt
diff --git a/sdm660-common/proprietary/vendor/etc/init/qmipriod.rc b/sdm660-common/proprietary/vendor/etc/init/qmipriod.rc
new file mode 100644
index 0000000..909fba0
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/qmipriod.rc
@@ -0,0 +1,20 @@
+# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+service vendor.qmipriod /system/vendor/bin/qmipriod
+    class main
+    user radio
+    group radio
+    disabled
+
+on property:persist.vendor.data.qmipriod_load=1
+    start vendor.qmipriod
+
+on property:persist.vendor.data.qmipriod_load=0
+    stop vendor.qmipriod
+
+on post-fs-data
+    #Create logging directory
+    mkdir /data/vendor/qmipriod 0770 radio radio
+    chmod 0770 /data/vendor/qmipriod
diff --git a/sdm660-common/proprietary/vendor/etc/init/ssgtzd.rc b/sdm660-common/proprietary/vendor/etc/init/ssgtzd.rc
new file mode 100644
index 0000000..1db24c7
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/ssgtzd.rc
@@ -0,0 +1,21 @@
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+
+
+# Create the directories used by qwes
+on post-fs-data
+    mkdir /data/vendor/qwes 0755 system system
+
+# Start daemon after boot completed
+on property:sys.boot_completed=1
+    start vendor.ssgtzd
+
+# Used 'disabled' flag, so daemon won't be started until explicit start
+service vendor.ssgtzd /vendor/bin/ssgtzd
+    class late_start
+    user system
+    group system
+    disabled
+    socket ssgtzd stream 0660 system inet
+    socket qwes_ipc stream 0660 system inet
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc
deleted file mode 100644
index e76d4cf..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service qti_esepowermanager_service /vendor/bin/hw/vendor.qti.esepowermanager@1.0-service
-    class hal
-    user system
-    group nfc system
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc
new file mode 100644
index 0000000..4fad146
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2017-2018, 2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+service qti_esepowermanager_service_1_1 /vendor/bin/hw/vendor.qti.esepowermanager@1.1-service
+    class hal
+    user system
+    group nfc system
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc
new file mode 100644
index 0000000..8324b28
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+on post-fs-data
+    # create QDMA shard dropbox
+    mkdir /data/vendor/qdma/shared 0770 system system
+    mkdir /data/vendor/qdma/shared/3 0770 system system
+
+service qccvndhalservice /vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service
+  class hal
+  user system
+  group system
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc
new file mode 100644
index 0000000..bae6658
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+#
+
+on init
+    start qseecom-service
+
+service qseecom-service /vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service
+    class hal
+    user system
+    group system drmrpc
diff --git a/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy b/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy
new file mode 100644
index 0000000..2222edb
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy
@@ -0,0 +1,80 @@
+# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc
+#
+# Not a contribution.
+#
+# Copyright (C) 2018 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.
+
+mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+munmap: 1
+mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+#prctl: arg0 == 0x37 /* PR_??? */ || arg0 == PR_SET_VMA || arg0 == PR_GET_DUMPABLE || arg0 == PR_SET_SECCOMP || arg0 == PR_CAP_AMBIENT || arg0 == PR_GET_NO_NEW_PRIVS || arg0 == PR_SET_DUMPABLE || arg0 == PR_GET_NAME || arg0 == PR_SET_PTRACER
+prctl: 1
+openat: 1
+read: 1
+futex: 1
+close: 1
+fstat: 1
+readlinkat: 1
+newfstatat: 1
+mremap: 1
+fstatfs: 1
+pread64: 1
+rt_sigprocmask: 1
+rt_sigaction: 1
+faccessat: 1
+#ioctl: arg1 == _IOC(_IOC_NONE
+ioctl: 1
+clock_gettime: 1
+getrandom: 1
+nanosleep: 1
+fcntl: 1
+getuid: 1
+sigaltstack: 1
+socket: arg0 == AF_QIPCRTR || arg0 == AF_UNIX
+writev: 1
+execve: 1
+getpid: 1
+set_tid_address: 1
+sched_getscheduler: 1
+sigaltstack: 1
+sched_getaffinity: 1
+connect: 1
+pipe2: 1
+clone: 1
+ppoll: 1
+restart_syscall: 1
+exit: 1
+exit_group: 1
+rt_sigreturn: 1
+rt_tgsigqueueinfo: 1
+getppid: 1
+dup: 1
+capget: 1
+capset: 1
+setsid: 1
+setitimer: 1
+ptrace: 1
+recvmsg: 1
+exit: 1
+restart_syscall: 1
+gettid: 1
+write: 1
+dup3: 1
+getdents64: 1
+getsockname: 1
+recvfrom: 1
+madvise: 1
diff --git a/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json b/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json
new file mode 100644
index 0000000..54b74b4
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json
@@ -0,0 +1,19 @@
+/********************************************************************
+Copyright (c) 2018-19 Qualcomm Technologies, Inc.
+All Rights Reserved.
+Confidential and Proprietary - Qualcomm Technologies, Inc.
+*********************************************************************/
+{
+  "embedded_ta_images": [
+    { "name":"qwes"},
+    { "name":"tzsc"}
+  ],
+  "ta_images": [
+    { "path":"/vendor/firmware_mnt/image/qwes.mbn"},
+    { "path":"/vendor/firmware/image/qwes.mbn"},
+    { "path":"/vendor/firmware_mnt/image/haventkn.mbn"},
+    { "path":"/vendor/firmware/image/haventkn.mbn"},
+    { "path":"/vendor/firmware_mnt/image/tzsc.mbn"},
+    { "path":"/vendor/firmware_mnt/image/rtice.mbn"}
+  ]
+}
diff --git a/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json b/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json
new file mode 100644
index 0000000..4e925a7
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json
@@ -0,0 +1,34 @@
+/********************************************************************
+Copyright (c) 2018 Qualcomm Technologies, Inc.
+All Rights Reserved.
+Confidential and Proprietary - Qualcomm Technologies, Inc.
+*********************************************************************/
+
+/*
+ * Configure class Ids available to third-party apps that try to
+ * communicate with TZ. The rules defined here are used by
+ * com.qualcomm.qti.qms.service.TrustZoneAccess to determine
+ * what classes are available to clients.
+ *
+ * For Example -
+ * { "classId":"80", "name":"I Need Location TA", "permissions":[ "android.permission.ACCESS_FINE_LOCATION" ] },
+ * classId: The class ID that a TA is assigned.
+ * name: The name of that TA. This is only a placeholder for now.
+ * permissions: A list of Android permissions that a client must have to use this TA.
+ */
+
+
+{
+  "whitelist": [
+    { "classId":"3", "name":"App Loader", "permissions":[] },
+    { "classId":"34", "name":"PVC License", "permissions":[] },
+    { "classId":"62", "name":"Device Attestation", "permissions":[] },
+    { "classId":"78", "name":"Haven Token", "permissions":[] },
+    { "classId":"70", "name":"RTIC App", "permissions":[] },
+    { "classId":"71", "name":"RTICe App", "permissions":[] },
+    { "classId":"101", "name":"Celluar Security Measures", "permissions":[] },
+    { "classId":"102", "name":"SCPassThrough", "permissions":[] },
+    { "classId":"119", "name":"Platform Feature Management", "permissions":[] },
+    { "classId":"146", "name":"TLOC Service", "permissions":[] }
+  ]
+}
diff --git a/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so b/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so
index e887fbd..18d29c0 100644
Binary files a/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so and b/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so b/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
index aa8493f..3f37144 100644
Binary files a/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so and b/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/hw/com.dsi.ant@1.0-impl.so b/sdm660-common/proprietary/vendor/lib/hw/com.dsi.ant@1.0-impl.so
new file mode 100644
index 0000000..2979d4c
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/hw/com.dsi.ant@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.esepowermanager@1.0-impl.so b/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.esepowermanager@1.0-impl.so
deleted file mode 100644
index 0fae7de..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.esepowermanager@1.0-impl.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so b/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so
new file mode 100644
index 0000000..90d7114
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so b/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
index 2aa2875..335b093 100644
Binary files a/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so and b/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libQSEEComAPI.so b/sdm660-common/proprietary/vendor/lib/libQSEEComAPI.so
index 15bdc9b..0a400ec 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libQSEEComAPI.so and b/sdm660-common/proprietary/vendor/lib/libQSEEComAPI.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libQTEEConnector_vendor.so b/sdm660-common/proprietary/vendor/lib/libQTEEConnector_vendor.so
new file mode 100644
index 0000000..90fa9bc
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libQTEEConnector_vendor.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libdiag.so b/sdm660-common/proprietary/vendor/lib/libdiag.so
index 663803c..f70c03e 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libdiag.so and b/sdm660-common/proprietary/vendor/lib/libdiag.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libdsutils.so b/sdm660-common/proprietary/vendor/lib/libdsutils.so
deleted file mode 100644
index e05fca8..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libdsutils.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libidl.so b/sdm660-common/proprietary/vendor/lib/libidl.so
index 9f57813..6d62330 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libidl.so and b/sdm660-common/proprietary/vendor/lib/libidl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libmdmdetect.so b/sdm660-common/proprietary/vendor/lib/libmdmdetect.so
index 14d141e..3c7840b 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libmdmdetect.so and b/sdm660-common/proprietary/vendor/lib/libmdmdetect.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libminkdescriptor.so b/sdm660-common/proprietary/vendor/lib/libminkdescriptor.so
deleted file mode 100644
index 3cd52a1..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libminkdescriptor.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libmmosal.so b/sdm660-common/proprietary/vendor/lib/libmmosal.so
new file mode 100644
index 0000000..b7ac69f
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libmmosal.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqcci_legacy.so b/sdm660-common/proprietary/vendor/lib/libqcci_legacy.so
index fadf2c3..9097d55 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqcci_legacy.so and b/sdm660-common/proprietary/vendor/lib/libqcci_legacy.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqdi.so b/sdm660-common/proprietary/vendor/lib/libqdi.so
deleted file mode 100644
index 412e5aa..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libqdi.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqdp.so b/sdm660-common/proprietary/vendor/lib/libqdp.so
deleted file mode 100644
index a5eec84..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libqdp.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi.so b/sdm660-common/proprietary/vendor/lib/libqmi.so
index 26769e5..daba18b 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqmi.so and b/sdm660-common/proprietary/vendor/lib/libqmi.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_cci.so b/sdm660-common/proprietary/vendor/lib/libqmi_cci.so
index 784e655..3e36100 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqmi_cci.so and b/sdm660-common/proprietary/vendor/lib/libqmi_cci.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_client_helper.so b/sdm660-common/proprietary/vendor/lib/libqmi_client_helper.so
index 4962467..f313f1c 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqmi_client_helper.so and b/sdm660-common/proprietary/vendor/lib/libqmi_client_helper.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_client_qmux.so b/sdm660-common/proprietary/vendor/lib/libqmi_client_qmux.so
index 1fb36a4..0d92118 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqmi_client_qmux.so and b/sdm660-common/proprietary/vendor/lib/libqmi_client_qmux.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_common_so.so b/sdm660-common/proprietary/vendor/lib/libqmi_common_so.so
index be8e337..3c15b67 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqmi_common_so.so and b/sdm660-common/proprietary/vendor/lib/libqmi_common_so.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_csi.so b/sdm660-common/proprietary/vendor/lib/libqmi_csi.so
index 7491817..b09a3ea 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqmi_csi.so and b/sdm660-common/proprietary/vendor/lib/libqmi_csi.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_csvt_srvc.so b/sdm660-common/proprietary/vendor/lib/libqmi_csvt_srvc.so
new file mode 100644
index 0000000..b368347
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libqmi_csvt_srvc.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_encdec.so b/sdm660-common/proprietary/vendor/lib/libqmi_encdec.so
index 495463e..e102692 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqmi_encdec.so and b/sdm660-common/proprietary/vendor/lib/libqmi_encdec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_legacy.so b/sdm660-common/proprietary/vendor/lib/libqmi_legacy.so
new file mode 100644
index 0000000..db6aff4
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libqmi_legacy.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmiservices.so b/sdm660-common/proprietary/vendor/lib/libqmiservices.so
index e6c1ce9..fa69002 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libqmiservices.so and b/sdm660-common/proprietary/vendor/lib/libqmiservices.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqrtr.so b/sdm660-common/proprietary/vendor/lib/libqrtr.so
new file mode 100644
index 0000000..d970b97
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libqrtr.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqsocket.so b/sdm660-common/proprietary/vendor/lib/libqsocket.so
new file mode 100644
index 0000000..1ae590b
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libqsocket.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libsdedrm.so b/sdm660-common/proprietary/vendor/lib/libsdedrm.so
index dd91ae6..9c0701d 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libsdedrm.so and b/sdm660-common/proprietary/vendor/lib/libsdedrm.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libsmemlog.so b/sdm660-common/proprietary/vendor/lib/libsmemlog.so
new file mode 100644
index 0000000..e7ab4b5
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libsmemlog.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libsystem_health_mon.so b/sdm660-common/proprietary/vendor/lib/libsystem_health_mon.so
new file mode 100644
index 0000000..77a18c1
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libsystem_health_mon.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so b/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so
index e402ee9..a88cfe6 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so and b/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so b/sdm660-common/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so
new file mode 100644
index 0000000..a82e961
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so b/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so
index 5e641d4..aa6506c 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so and b/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so b/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so
index 9114b4d..77506d2 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so and b/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so b/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so
index b21c067..a1adb01 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so and b/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libwfdmodulehdcpsession.so b/sdm660-common/proprietary/vendor/lib/libwfdmodulehdcpsession.so
index 4d976ce..702aa0b 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libwfdmodulehdcpsession.so and b/sdm660-common/proprietary/vendor/lib/libwfdmodulehdcpsession.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/vendor.qti.esepowermanager@1.0.so b/sdm660-common/proprietary/vendor/lib/vendor.qti.esepowermanager@1.0.so
deleted file mode 100644
index 862b080..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/vendor.qti.esepowermanager@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so b/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so
new file mode 100644
index 0000000..14193e0
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qteeconnector@1.0.so b/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qteeconnector@1.0.so
index a899f3e..3fcfeb4 100644
Binary files a/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qteeconnector@1.0.so and b/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qteeconnector@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.tui_comm@1.0.so b/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.tui_comm@1.0.so
new file mode 100644
index 0000000..8d59fdd
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.tui_comm@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so
deleted file mode 100644
index 6de483c..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so
index 6e64c1c..53dcf64 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so
index 5793aca..6a0cb9b 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so
index 53e35c2..4b478a0 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so
index 3779003..5540c9a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so
index 2dbf17e..1ada97a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so
index db833fd..9cf7aa0 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so
index 534a069..f1a9165 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so
index 4204e5a..5ae2325 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so
new file mode 100644
index 0000000..91e130f
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/deviceInfoServiceModule.so b/sdm660-common/proprietary/vendor/lib64/deviceInfoServiceModule.so
index b795412..c10722d 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/deviceInfoServiceModule.so and b/sdm660-common/proprietary/vendor/lib64/deviceInfoServiceModule.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so b/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
index 1297631..8ac36f9 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so and b/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so
new file mode 100644
index 0000000..bf63f2f
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
deleted file mode 100644
index 854bd47..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so
deleted file mode 100644
index c08afb5..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so
new file mode 100644
index 0000000..a21ba1f
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
index 5c887f6..4f990b2 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so
deleted file mode 100644
index 328f495..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so
new file mode 100644
index 0000000..e785ee6
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
index f5c25e9..5cae101 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
new file mode 100644
index 0000000..7146962
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
index 5c437eb..cdde263 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so
new file mode 100644
index 0000000..975644d
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so
new file mode 100644
index 0000000..2057371
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
index 2101562..bfe77a7 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
index 61e9906..cc72d03 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-imscmservice.so b/sdm660-common/proprietary/vendor/lib64/lib-imscmservice.so
index 9a95a47..9124058 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-imscmservice.so and b/sdm660-common/proprietary/vendor/lib64/lib-imscmservice.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-imsdpl.so b/sdm660-common/proprietary/vendor/lib64/lib-imsdpl.so
index 4b6b405..a275f24 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-imsdpl.so and b/sdm660-common/proprietary/vendor/lib64/lib-imsdpl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-imsqimf.so b/sdm660-common/proprietary/vendor/lib64/lib-imsqimf.so
index d63fadd..7ff2444 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-imsqimf.so and b/sdm660-common/proprietary/vendor/lib64/lib-imsqimf.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-imsrcs-v2.so b/sdm660-common/proprietary/vendor/lib64/lib-imsrcs-v2.so
index 207f549..1ee84e3 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-imsrcs-v2.so and b/sdm660-common/proprietary/vendor/lib64/lib-imsrcs-v2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so b/sdm660-common/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so
index 18d6196..3f585ca 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so and b/sdm660-common/proprietary/vendor/lib64/lib-imsrcsbaseimpl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-imsvtcore.so b/sdm660-common/proprietary/vendor/lib64/lib-imsvtcore.so
index f8fa0f3..1cfc044 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-imsvtcore.so and b/sdm660-common/proprietary/vendor/lib64/lib-imsvtcore.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-imsxml.so b/sdm660-common/proprietary/vendor/lib64/lib-imsxml.so
index eebf339..2cd5cab 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-imsxml.so and b/sdm660-common/proprietary/vendor/lib64/lib-imsxml.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-rcsconfig.so b/sdm660-common/proprietary/vendor/lib64/lib-rcsconfig.so
index 1124ac9..68d0301 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-rcsconfig.so and b/sdm660-common/proprietary/vendor/lib64/lib-rcsconfig.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-rtpcommon.so b/sdm660-common/proprietary/vendor/lib64/lib-rtpcommon.so
index 8fdd7ca..be8b97b 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-rtpcommon.so and b/sdm660-common/proprietary/vendor/lib64/lib-rtpcommon.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-rtpcore.so b/sdm660-common/proprietary/vendor/lib64/lib-rtpcore.so
index c8d75a3..f22eccd 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-rtpcore.so and b/sdm660-common/proprietary/vendor/lib64/lib-rtpcore.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-rtpsl.so b/sdm660-common/proprietary/vendor/lib64/lib-rtpsl.so
index 9add3ad..cd4215e 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-rtpsl.so and b/sdm660-common/proprietary/vendor/lib64/lib-rtpsl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-siputility.so b/sdm660-common/proprietary/vendor/lib64/lib-siputility.so
index 0b3ee88..186c4c2 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-siputility.so and b/sdm660-common/proprietary/vendor/lib64/lib-siputility.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-uceservice.so b/sdm660-common/proprietary/vendor/lib64/lib-uceservice.so
index d8e5693..0a565fb 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/lib-uceservice.so and b/sdm660-common/proprietary/vendor/lib64/lib-uceservice.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libGPreqcancel.so b/sdm660-common/proprietary/vendor/lib64/libGPreqcancel.so
index d5bf085..4f1c8a9 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libGPreqcancel.so and b/sdm660-common/proprietary/vendor/lib64/libGPreqcancel.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libGPreqcancel_svc.so b/sdm660-common/proprietary/vendor/lib64/libGPreqcancel_svc.so
index 19332ca..96c5014 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libGPreqcancel_svc.so and b/sdm660-common/proprietary/vendor/lib64/libGPreqcancel_svc.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libQSEEComAPI.so b/sdm660-common/proprietary/vendor/lib64/libQSEEComAPI.so
index b79ff10..d67587e 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libQSEEComAPI.so and b/sdm660-common/proprietary/vendor/lib64/libQSEEComAPI.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libQTEEConnector_vendor.so b/sdm660-common/proprietary/vendor/lib64/libQTEEConnector_vendor.so
new file mode 100644
index 0000000..37cdfc6
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libQTEEConnector_vendor.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libSecureUILib.so b/sdm660-common/proprietary/vendor/lib64/libSecureUILib.so
index 008733c..47511ca 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libSecureUILib.so and b/sdm660-common/proprietary/vendor/lib64/libSecureUILib.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libStDrvInt.so b/sdm660-common/proprietary/vendor/lib64/libStDrvInt.so
index 00ae708..f8e9268 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libStDrvInt.so and b/sdm660-common/proprietary/vendor/lib64/libStDrvInt.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libbase64.so b/sdm660-common/proprietary/vendor/lib64/libbase64.so
new file mode 100644
index 0000000..aa2bb45
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libbase64.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libbt-hidlclient.so b/sdm660-common/proprietary/vendor/lib64/libbt-hidlclient.so
new file mode 100644
index 0000000..327c27e
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libbt-hidlclient.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libbtnv.so b/sdm660-common/proprietary/vendor/lib64/libbtnv.so
index 0b06912..75e140e 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libbtnv.so and b/sdm660-common/proprietary/vendor/lib64/libbtnv.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcacertclient.so b/sdm660-common/proprietary/vendor/lib64/libcacertclient.so
new file mode 100644
index 0000000..4702b32
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libcacertclient.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcne.so b/sdm660-common/proprietary/vendor/lib64/libcne.so
index 5bb6346..d8a0c94 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libcne.so and b/sdm660-common/proprietary/vendor/lib64/libcne.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcneapiclient.so b/sdm660-common/proprietary/vendor/lib64/libcneapiclient.so
index 29848c4..b7faeba 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libcneapiclient.so and b/sdm660-common/proprietary/vendor/lib64/libcneapiclient.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcneoplookup.so b/sdm660-common/proprietary/vendor/lib64/libcneoplookup.so
index b38fd7d..5a9af60 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libcneoplookup.so and b/sdm660-common/proprietary/vendor/lib64/libcneoplookup.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcneqmiutils.so b/sdm660-common/proprietary/vendor/lib64/libcneqmiutils.so
index f2af38a..1841e4e 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libcneqmiutils.so and b/sdm660-common/proprietary/vendor/lib64/libcneqmiutils.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libconfigdb.so b/sdm660-common/proprietary/vendor/lib64/libconfigdb.so
index 4d5ae19..a8a702d 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libconfigdb.so and b/sdm660-common/proprietary/vendor/lib64/libconfigdb.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdiag.so b/sdm660-common/proprietary/vendor/lib64/libdiag.so
index 69bd99f..04e0a27 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libdiag.so and b/sdm660-common/proprietary/vendor/lib64/libdiag.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdpmqmihal.so b/sdm660-common/proprietary/vendor/lib64/libdpmqmihal.so
index 65b22d6..2857179 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libdpmqmihal.so and b/sdm660-common/proprietary/vendor/lib64/libdpmqmihal.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdrmfs.so b/sdm660-common/proprietary/vendor/lib64/libdrmfs.so
index 354c0dd..67d3f1d 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libdrmfs.so and b/sdm660-common/proprietary/vendor/lib64/libdrmfs.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdrmtime.so b/sdm660-common/proprietary/vendor/lib64/libdrmtime.so
index b7769b8..b346825 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libdrmtime.so and b/sdm660-common/proprietary/vendor/lib64/libdrmtime.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdsi_netctrl.so b/sdm660-common/proprietary/vendor/lib64/libdsi_netctrl.so
index 1232da8..e954705 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libdsi_netctrl.so and b/sdm660-common/proprietary/vendor/lib64/libdsi_netctrl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdsutils.so b/sdm660-common/proprietary/vendor/lib64/libdsutils.so
index b59c3ba..f684f32 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libdsutils.so and b/sdm660-common/proprietary/vendor/lib64/libdsutils.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libidl.so b/sdm660-common/proprietary/vendor/lib64/libidl.so
index 56b32d5..6516823 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libidl.so and b/sdm660-common/proprietary/vendor/lib64/libidl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libjnihelper.so b/sdm660-common/proprietary/vendor/lib64/libjnihelper.so
new file mode 100644
index 0000000..f490d68
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libjnihelper.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblqe.so b/sdm660-common/proprietary/vendor/lib64/liblqe.so
index 96858ed..fac740c 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/liblqe.so and b/sdm660-common/proprietary/vendor/lib64/liblqe.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libmdmdetect.so b/sdm660-common/proprietary/vendor/lib64/libmdmdetect.so
index 42b21da..7876c8f 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libmdmdetect.so and b/sdm660-common/proprietary/vendor/lib64/libmdmdetect.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libminkdescriptor.so b/sdm660-common/proprietary/vendor/lib64/libminkdescriptor.so
index aa45ca4..50bed47 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libminkdescriptor.so and b/sdm660-common/proprietary/vendor/lib64/libminkdescriptor.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libmmosal.so b/sdm660-common/proprietary/vendor/lib64/libmmosal.so
new file mode 100644
index 0000000..415375e
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libmmosal.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libnative-api.so b/sdm660-common/proprietary/vendor/lib64/libnative-api.so
new file mode 100644
index 0000000..9670e55
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libnative-api.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libnetmgr.so b/sdm660-common/proprietary/vendor/lib64/libnetmgr.so
index 84c953e..1a47883 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libnetmgr.so and b/sdm660-common/proprietary/vendor/lib64/libnetmgr.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libnetmgr_common.so b/sdm660-common/proprietary/vendor/lib64/libnetmgr_common.so
index bcae544..ca9f55b 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libnetmgr_common.so and b/sdm660-common/proprietary/vendor/lib64/libnetmgr_common.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libnetmgr_nr_fusion.so b/sdm660-common/proprietary/vendor/lib64/libnetmgr_nr_fusion.so
index 966e868..b8dd32b 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libnetmgr_nr_fusion.so and b/sdm660-common/proprietary/vendor/lib64/libnetmgr_nr_fusion.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so b/sdm660-common/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so
index b063cf4..ddc244e 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so and b/sdm660-common/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libnlnetmgr.so b/sdm660-common/proprietary/vendor/lib64/libnlnetmgr.so
index 69b0972..1ea671c 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libnlnetmgr.so and b/sdm660-common/proprietary/vendor/lib64/libnlnetmgr.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liboemaids_vendor.so b/sdm660-common/proprietary/vendor/lib64/liboemaids_vendor.so
deleted file mode 100644
index db93130..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/liboemaids_vendor.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libpdmapper.so b/sdm660-common/proprietary/vendor/lib64/libpdmapper.so
index 019d5f2..acd44d6 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libpdmapper.so and b/sdm660-common/proprietary/vendor/lib64/libpdmapper.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libpdnotifier.so b/sdm660-common/proprietary/vendor/lib64/libpdnotifier.so
index 040ec1f..f065770 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libpdnotifier.so and b/sdm660-common/proprietary/vendor/lib64/libpdnotifier.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcbor.so b/sdm660-common/proprietary/vendor/lib64/libqcbor.so
new file mode 100644
index 0000000..600e641
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libqcbor.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcci_legacy.so b/sdm660-common/proprietary/vendor/lib64/libqcci_legacy.so
index 6250a9c..1738a94 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqcci_legacy.so and b/sdm660-common/proprietary/vendor/lib64/libqcci_legacy.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcmaputils.so b/sdm660-common/proprietary/vendor/lib64/libqcmaputils.so
index 13a4970..84113fd 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqcmaputils.so and b/sdm660-common/proprietary/vendor/lib64/libqcmaputils.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcrilFramework.so b/sdm660-common/proprietary/vendor/lib64/libqcrilFramework.so
index 8236e34..c83e46c 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqcrilFramework.so and b/sdm660-common/proprietary/vendor/lib64/libqcrilFramework.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcrildatactl.so b/sdm660-common/proprietary/vendor/lib64/libqcrildatactl.so
index d87bdf0..0f62c5a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqcrildatactl.so and b/sdm660-common/proprietary/vendor/lib64/libqcrildatactl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqdi.so b/sdm660-common/proprietary/vendor/lib64/libqdi.so
index 63324dd..2353865 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqdi.so and b/sdm660-common/proprietary/vendor/lib64/libqdi.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so b/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so
index 5548c49..52459ea 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so and b/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqdp.so b/sdm660-common/proprietary/vendor/lib64/libqdp.so
index c99153c..dd7d8ee 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqdp.so and b/sdm660-common/proprietary/vendor/lib64/libqdp.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqisl.so b/sdm660-common/proprietary/vendor/lib64/libqisl.so
index c1bab8f..73fe4f5 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqisl.so and b/sdm660-common/proprietary/vendor/lib64/libqisl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi.so b/sdm660-common/proprietary/vendor/lib64/libqmi.so
index 0150469..2080967 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmi.so and b/sdm660-common/proprietary/vendor/lib64/libqmi.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi_cci.so b/sdm660-common/proprietary/vendor/lib64/libqmi_cci.so
index 406704d..950f8f3 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmi_cci.so and b/sdm660-common/proprietary/vendor/lib64/libqmi_cci.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi_client_helper.so b/sdm660-common/proprietary/vendor/lib64/libqmi_client_helper.so
index 7100797..33522f6 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmi_client_helper.so and b/sdm660-common/proprietary/vendor/lib64/libqmi_client_helper.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi_client_qmux.so b/sdm660-common/proprietary/vendor/lib64/libqmi_client_qmux.so
index 9e48fde..3a476ed 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmi_client_qmux.so and b/sdm660-common/proprietary/vendor/lib64/libqmi_client_qmux.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi_common_so.so b/sdm660-common/proprietary/vendor/lib64/libqmi_common_so.so
index 5098a3f..07a2dd0 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmi_common_so.so and b/sdm660-common/proprietary/vendor/lib64/libqmi_common_so.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi_csi.so b/sdm660-common/proprietary/vendor/lib64/libqmi_csi.so
index 61f3799..d4855f8 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmi_csi.so and b/sdm660-common/proprietary/vendor/lib64/libqmi_csi.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi_csvt_srvc.so b/sdm660-common/proprietary/vendor/lib64/libqmi_csvt_srvc.so
new file mode 100644
index 0000000..110f3d3
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libqmi_csvt_srvc.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi_encdec.so b/sdm660-common/proprietary/vendor/lib64/libqmi_encdec.so
index b013204..394583c 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmi_encdec.so and b/sdm660-common/proprietary/vendor/lib64/libqmi_encdec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmi_legacy.so b/sdm660-common/proprietary/vendor/lib64/libqmi_legacy.so
index 0dc54b5..ce0973d 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmi_legacy.so and b/sdm660-common/proprietary/vendor/lib64/libqmi_legacy.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmiextservices.so b/sdm660-common/proprietary/vendor/lib64/libqmiextservices.so
new file mode 100644
index 0000000..588f9b3
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libqmiextservices.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqmiservices.so b/sdm660-common/proprietary/vendor/lib64/libqmiservices.so
index 9d32cdd..1f1cd83 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqmiservices.so and b/sdm660-common/proprietary/vendor/lib64/libqmiservices.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqrtr.so b/sdm660-common/proprietary/vendor/lib64/libqrtr.so
index f8f5830..60651ab 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqrtr.so and b/sdm660-common/proprietary/vendor/lib64/libqrtr.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqsocket.so b/sdm660-common/proprietary/vendor/lib64/libqsocket.so
index 98addcd..c92965a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqsocket.so and b/sdm660-common/proprietary/vendor/lib64/libqsocket.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/librcc.so b/sdm660-common/proprietary/vendor/lib64/librcc.so
index ddd30d9..4b34ebc 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/librcc.so and b/sdm660-common/proprietary/vendor/lib64/librcc.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libril-qc-hal-qmi.so b/sdm660-common/proprietary/vendor/lib64/libril-qc-hal-qmi.so
index 580ffd0..4db5304 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libril-qc-hal-qmi.so and b/sdm660-common/proprietary/vendor/lib64/libril-qc-hal-qmi.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libril-qc-logger.so b/sdm660-common/proprietary/vendor/lib64/libril-qc-logger.so
index 0e1f010..747a4b9 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libril-qc-logger.so and b/sdm660-common/proprietary/vendor/lib64/libril-qc-logger.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so b/sdm660-common/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so
index 33bdf7e..57f64e5 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so and b/sdm660-common/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libril-qc-radioconfig.so b/sdm660-common/proprietary/vendor/lib64/libril-qc-radioconfig.so
index 5a49649..51d91b2 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libril-qc-radioconfig.so and b/sdm660-common/proprietary/vendor/lib64/libril-qc-radioconfig.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libril-qcril-hook-oem.so b/sdm660-common/proprietary/vendor/lib64/libril-qcril-hook-oem.so
index 9f124d5..b55c000 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libril-qcril-hook-oem.so and b/sdm660-common/proprietary/vendor/lib64/libril-qcril-hook-oem.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/librilqmiservices.so b/sdm660-common/proprietary/vendor/lib64/librilqmiservices.so
index 0afa566..017ed93 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/librilqmiservices.so and b/sdm660-common/proprietary/vendor/lib64/librilqmiservices.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/librmp.so b/sdm660-common/proprietary/vendor/lib64/librmp.so
new file mode 100644
index 0000000..9183b43
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/librmp.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/librpmb.so b/sdm660-common/proprietary/vendor/lib64/librpmb.so
index 3417580..b35884c 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/librpmb.so and b/sdm660-common/proprietary/vendor/lib64/librpmb.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsdedrm.so b/sdm660-common/proprietary/vendor/lib64/libsdedrm.so
index a4e436b..6ffd8e3 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libsdedrm.so and b/sdm660-common/proprietary/vendor/lib64/libsdedrm.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsecureui.so b/sdm660-common/proprietary/vendor/lib64/libsecureui.so
new file mode 100644
index 0000000..17638ef
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libsecureui.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsecureui_svcsock.so b/sdm660-common/proprietary/vendor/lib64/libsecureui_svcsock.so
index 58c1a16..782690d 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libsecureui_svcsock.so and b/sdm660-common/proprietary/vendor/lib64/libsecureui_svcsock.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsettings.so b/sdm660-common/proprietary/vendor/lib64/libsettings.so
index 5a4bfc7..cac0d19 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libsettings.so and b/sdm660-common/proprietary/vendor/lib64/libsettings.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsi.so b/sdm660-common/proprietary/vendor/lib64/libsi.so
new file mode 100644
index 0000000..653d0b8
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libsi.so differ
diff --git a/sdm660-common/proprietary/system/lib/libwfduibcinterface.so b/sdm660-common/proprietary/vendor/lib64/libsmemlog.so
similarity index 65%
rename from sdm660-common/proprietary/system/lib/libwfduibcinterface.so
rename to sdm660-common/proprietary/vendor/lib64/libsmemlog.so
index 84bff7d..ead3424 100644
Binary files a/sdm660-common/proprietary/system/lib/libwfduibcinterface.so and b/sdm660-common/proprietary/vendor/lib64/libsmemlog.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libssd.so b/sdm660-common/proprietary/vendor/lib64/libssd.so
index d5849e3..3794598 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libssd.so and b/sdm660-common/proprietary/vendor/lib64/libssd.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsystem_health_mon.so b/sdm660-common/proprietary/vendor/lib64/libsystem_health_mon.so
index 58fcbe9..7e609cd 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libsystem_health_mon.so and b/sdm660-common/proprietary/vendor/lib64/libsystem_health_mon.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libtime_genoff.so b/sdm660-common/proprietary/vendor/lib64/libtime_genoff.so
index 32b7d5f..76bb400 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libtime_genoff.so and b/sdm660-common/proprietary/vendor/lib64/libtime_genoff.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libtzdrmgenprov.so b/sdm660-common/proprietary/vendor/lib64/libtzdrmgenprov.so
new file mode 100644
index 0000000..4762c05
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libtzdrmgenprov.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libwfdhdcpcp.so b/sdm660-common/proprietary/vendor/lib64/libwfdhdcpcp.so
new file mode 100644
index 0000000..99a1fe4
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libwfdhdcpcp.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libwms.so b/sdm660-common/proprietary/vendor/lib64/libwms.so
index 9aa9b99..3c85d4a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libwms.so and b/sdm660-common/proprietary/vendor/lib64/libwms.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libwqe.so b/sdm660-common/proprietary/vendor/lib64/libwqe.so
index f81d17b..5d084c4 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libwqe.so and b/sdm660-common/proprietary/vendor/lib64/libwqe.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libxml.so b/sdm660-common/proprietary/vendor/lib64/libxml.so
index 73e6cf6..613118a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libxml.so and b/sdm660-common/proprietary/vendor/lib64/libxml.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/qcrild_librilutils.so b/sdm660-common/proprietary/vendor/lib64/qcrild_librilutils.so
index 8652b82..ce631ce 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/qcrild_librilutils.so and b/sdm660-common/proprietary/vendor/lib64/qcrild_librilutils.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/qtibus.so b/sdm660-common/proprietary/vendor/lib64/qtibus.so
index 505b063..6e9124a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/qtibus.so and b/sdm660-common/proprietary/vendor/lib64/qtibus.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/qtimutex.so b/sdm660-common/proprietary/vendor/lib64/qtimutex.so
index 202a912..400f3b2 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/qtimutex.so and b/sdm660-common/proprietary/vendor/lib64/qtimutex.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so
index d43908e..496c5c4 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so
index 6e69ca1..f71de5b 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so
new file mode 100644
index 0000000..a852f81
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so
new file mode 100644
index 0000000..5c49c6e
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so
index 6951cd5..ecbd15c 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so
index 8a5014f..6f791bf 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.1.so
new file mode 100644
index 0000000..a43afc3
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so
index d442c09..9a20ecd 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
index e89ef8d..e9f6ef4 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
new file mode 100644
index 0000000..b737918
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so
new file mode 100644
index 0000000..8252b88
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so
index e16af24..bd4e6f5 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so
index 121778f..0060af3 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so
index 4a8132b..a21bb8b 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so
index f809fd0..9f95c26 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so
index 735903b..fb18071 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so
index c31a994..4625d1e 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so
index 9b35d2b..b148b2f 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so
index f1fd807..a10875e 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so
index b6e42f6..4cde327 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so
index 9692d44..c9f4c42 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so
new file mode 100644
index 0000000..9c077b6
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so
new file mode 100644
index 0000000..d481902
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so
new file mode 100644
index 0000000..97173ee
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so
new file mode 100644
index 0000000..e757a85
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so
index 5d93f05..7f24fab 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so
index 28a808f..909a5d0 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
index 2f55cf4..7f10bd0 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so
index 84402af..d63faef 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so
index 99a8bc0..4cbf661 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so
index e6f2f9b..a1253a1 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so
index bad0ccd..bc4ccc3 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so
index ffa6ecf..f5ffaf7 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so
index 10ec2fb..dd9e801 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.5.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so
index c662ffb..b34df03 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.6.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so
new file mode 100644
index 0000000..58184d4
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so
index 4ff3f2b..cc5b254 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so
index 4420b20..1b227ec 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so
new file mode 100644
index 0000000..b399813
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so
index 0306e3a..ec9d656 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so
index 644c851..eca511b 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so
index 5a5dfca..5c56a8a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so
index a1cc219..11c95dc 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so
index 0867325..740b672 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so
index be577bd..e36d800 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so
index 90adaa5..af0d5ec 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so
new file mode 100644
index 0000000..54b03f7
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so
new file mode 100644
index 0000000..266e2e3
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so
index 555cc1a..3106e58 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so
index 1a8c56c..f5bc8a8 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so
index 3410196..30fe266 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so
index 4dfd0f5..796b73e 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so
index 89c94d0..e8138fe 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so
index 3a1f5dc..1eef38d 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so
index a423fc0..6b38fd0 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so
index 033cdfd..a91c214 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so
index ec1d68f..8deeaa7 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.soter@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so
index 1600e83..7b60656 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so
index 52cb3de..4e2637a 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so
index aa4bf85..f0c2982 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so
index 915f675..8dcdf46 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so
index 8dbb030..ffe7a08 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so
index 4279cc7..1b37df3 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so
index b27e953..4efef4f 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so
new file mode 100644
index 0000000..bef9a3b
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
index 880b775..eb0a08c 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so
index 813d241..2c74237 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.0.so
index da08645..61a8cb2 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.0.so differ
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/qcril.db b/sdm660-common/proprietary/vendor/radio/qcril_database/qcril.db
index 176e371..e2b96f3 100644
Binary files a/sdm660-common/proprietary/vendor/radio/qcril_database/qcril.db and b/sdm660-common/proprietary/vendor/radio/qcril_database/qcril.db differ
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql
index 39f240f..7eb5803 100644
--- a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql
+++ b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql
@@ -8,741 +8,526 @@
 PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
 CREATE TABLE qcril_emergency_source_mcc_table(MCC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER));
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','100','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','101','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','102','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','1221','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('250','102','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('250','101','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('250','103','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('250','104','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('255','101','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('255','102','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('255','103','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('255','104','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','100','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','166','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','108','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('525','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('525','1777','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('426','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('426','997','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('426','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('432','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('432','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('432','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('432','125','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','104','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('416','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('416','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('419','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('422','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('422','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','997','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','998','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('421','191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('421','194','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('401','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('401','102','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('401','101','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('401','103','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('401','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','15','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','16','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','114','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','117','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('736','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('736','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('730','133','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('901','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('901','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('404','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','191','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1669','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','199','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','112','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','911','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1154','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1554','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1155','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('414','191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('414','192','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('414','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('515','112','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('515','911','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','113','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','125','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','111','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','117','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','120','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('466','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('466','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('852','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','113','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','129','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('452','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('502','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('502','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('502','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('405','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('302','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('302','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','192','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','117','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','192','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('706','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','120','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','123','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','125','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','128','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','102','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','103','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','113','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','114','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','029561967','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','029132023','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('234','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('505','000','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','120','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','121','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','123','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','126','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','129','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','180','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('260','08','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('260','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('260','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('230','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','114','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','116','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','000','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','196','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','197','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','15','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','17','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','18','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','08','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('272','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('272','1913','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('724','190','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('420','997','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('420','998','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('420','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('420','993','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('621','119','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('334','060','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','133','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('732','123','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('901','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('901','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','191','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','1669','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','199','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','112','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','911','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('414','191','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('414','192','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('414','199','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('515','117','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('515','112','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('515','911','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','119','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','120','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('852','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('510','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('510','118','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('510','199','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('510','113','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('510','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('452','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('452','113','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('452','114','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('452','115','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('502','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('502','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('502','991','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('502','994','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('502','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('310','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('310','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('302','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('302','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('456','191','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('456','192','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('456','199','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','191','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','192','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','199','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('706','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('334','066','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('716','105','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','100',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','101',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','102',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','108',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','112',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','100',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','101',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','102',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','108',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','112',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('234','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('505','000','','');
 CREATE TABLE qcril_emergency_source_voice_table(MCC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER));
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('425','100','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('425','101','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('425','102','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('425','1221','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','119','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','120','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','999','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('466','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('466','119','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('852','999','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','122','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','191','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','1669','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','199','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','911','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','1154','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','1155','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','1554','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('515','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('515','911','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('515','8888','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','118','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','113','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','119','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','115','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','129','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('452','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('452','113','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('452','114','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('452','115','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('502','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('502','911','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('502','999','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('230','150','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('230','155','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('230','158','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('414','191','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('414','192','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('414','199','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','114','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','115','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','116','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','000','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','119','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','191','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','196','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','197','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','999','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','118','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','15','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','17','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','18','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('208','08','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('202','100','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('202','166','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('202','199','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('405','100','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('405','101','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('405','102','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('262','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','121','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','122','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','123','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','126','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','128','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','129','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','150','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','180','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','110','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','119','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','120','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','112','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','999','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('852','999','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','122','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('520','191','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('520','1669','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('520','199','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('520','112','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('520','911','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('414','191','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('414','192','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('414','199','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('515','117','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('515','112','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('515','911','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('510','110','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('510','118','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('510','199','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('510','113','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('510','112','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('452','112','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('452','113','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('452','114','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('452','115','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('502','112','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('502','911','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('502','991','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('502','994','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('502','999','','full');
 CREATE TABLE qcril_emergency_source_hard_mcc_table(MCC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER));
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','120','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','118','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','111','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','113','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','117','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','125','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('466','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('466','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('852','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('404','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','1669','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','1554','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','1154','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','1155','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('414','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('414','192','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('414','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('515','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('515','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('515','8888','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','118','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','113','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','115','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','129','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('452','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('502','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('502','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('502','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('405','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('310','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('310','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('310','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('302','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('302','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('302','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('456','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('456','192','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('456','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('457','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('457','192','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('457','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('730','133','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('429','100','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('429','101','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('429','102','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('429','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('429','103','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','029561967','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','029132023','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('234','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('234','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('234','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','08','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','000','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('214','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('268','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('204','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('272','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('272','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('272','1913','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('216','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('230','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('655','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('655','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('286','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('226','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('226','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('206','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('260','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('260','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','150','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','155','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','158','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('214','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('208','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('208','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('334','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('334','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('732','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('732','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('716','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('716','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','190','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','192','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','193','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('722','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('722','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('736','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('736','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('730','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('730','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('712','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('712','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('740','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('740','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('706','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('706','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('704','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('704','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('710','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('710','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('714','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('714','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('748','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('748','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('734','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('734','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','000','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','08','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','118','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('250','101','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('250','102','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('250','103','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('250','104','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('250','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('255','101','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('255','102','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('255','103','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('255','104','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','100','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','166','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('525','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('525','1777','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('426','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('426','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('426','997','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('432','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('432','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('432','115','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('432','125','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','115','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','104','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('416','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('416','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('419','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('422','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('422','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('424','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('424','997','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('424','998','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('424','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('421','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('421','194','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('401','101','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('401','102','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('401','103','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('401','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('744','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('744','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','120','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','121','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','123','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','126','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','128','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','129','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','150','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','180','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','100','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','101','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','102','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','1221','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','120','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('852','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','122','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('520','191','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('520','1669','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('520','199','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('520','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('520','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','191','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','192','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','199','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('515','117','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('515','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('515','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','199','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','113','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','113','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','114','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','115','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('502','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('502','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('502','991','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('502','994','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('502','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('310','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('310','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('310','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('302','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('302','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('302','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('456','191','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('456','192','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('456','199','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('457','191','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('457','192','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('457','199','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','133','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','100',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','101',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','102',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','108',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','112',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','100',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','101',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','102',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','108',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','112',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('234','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('234','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('234','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('204','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','150','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','155','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','158','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('655','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('655','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('286','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('226','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('226','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('260','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('260','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('231','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('231','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('208','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('208','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','060','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('732','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('732','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('716','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('716','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('724','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('724','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('724','190','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('724','192','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('724','193','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('722','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('722','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('712','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('712','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('740','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('740','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('706','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('706','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('710','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('710','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('714','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('714','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('734','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('734','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','122','','');
 CREATE TABLE qcril_emergency_source_nw_table(MCC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER));
 CREATE TABLE qcril_emergency_source_escv_iin_table(IIN TEXT, NUMBER TEXT, ESCV INTEGER, ROAM TEXT, PRIMARY KEY(IIN,NUMBER,ROAM));
 CREATE TABLE qcril_emergency_source_escv_nw_table(MCC TEXT, MNC TEXT, NUMBER TEXT, ESCV INTEGER, PRIMARY KEY(MCC,NUMBER, ESCV));
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','111',7);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','112',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','113',3);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','117',18);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','118',19);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','119',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','122',8);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','125',9);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','911',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('414','','191',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('414','','192',2);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('414','','199',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('466','05','110',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('466','05','112',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('466','05','119',2);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('202','','112',0);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('202','','100',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('202','','199',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('202','','166',2);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('716','06','105',1);
 CREATE TABLE qcril_emergency_source_mcc_mnc_table(MCC TEXT, MNC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER,MNC));
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','20','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','20','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','15','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','15','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','15','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('214','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('268','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('204','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('272','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('272','01','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('216','70','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('655','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('655','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('286','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('226','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('226','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','103','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','110','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('260','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('260','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','150','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','155','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','158','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','06','155','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','06','158','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','06','150','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('214','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('214','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('208','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('208','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','020','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','020','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','20','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','20','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','20','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','192','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','193','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','128','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','153','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','180','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','185','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','188','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','191','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','194','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','197','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','198','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','199','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','192','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','193','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','192','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','193','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','07','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','07','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','070','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','070','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','310','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','310','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','310','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','310','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','330','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','330','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','330','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','330','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','320','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','320','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','320','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','320','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','02','131','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','02','132','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','02','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','03','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','001','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','001','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','001','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','102','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','102','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','102','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','123','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','123','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','123','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('712','04','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('712','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','00','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','00','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04','122','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','01','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','01','122','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','03','122','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','030','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','030','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','30','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','30','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','300','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','300','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73','115','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73','128','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','103','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','104','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','106','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','108','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','109','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','141','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','155','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','311','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','06','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','06','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','06','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','07','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','07','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','10','104','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','30','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','30','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','33','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','33','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','113','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','114','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','115','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','199','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','029132023','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','029561967','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('525','05','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('744','02','128','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('744','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','111','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','113','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','116','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','195','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','198','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','199','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','119','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','110','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('712','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','001','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','001','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','001','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','21','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','21','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','23','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','23','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','119','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('330','110','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('525','05','995','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','02','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','125','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','119','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','146','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','144','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','126','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','111','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','141','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','147','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','106','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','020','066','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','02','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','20','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','20','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','15','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','15','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','15','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','99','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','99','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','99','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','99','08','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','99','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','99','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('214','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('268','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('204','04','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('272','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('272','01','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('216','70','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('230','03','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('230','03','150','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('230','03','155','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('230','03','158','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('286','02','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('226','10','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('226','10','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('206','10','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('260','03','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('260','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('231','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('231','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('214','03','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('214','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','020','060','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','020','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','020','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','101','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','101','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','10','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','10','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','05','190','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','05','192','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','05','193','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','05','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','05','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','12','190','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','12','192','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','12','193','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','12','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','12','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','38','190','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','38','192','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','38','193','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','38','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('724','38','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','07','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','07','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','10','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','10','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','070','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','070','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('730','02','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('730','02','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('730','02','133','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','001','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','001','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','001','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','102','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','102','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','102','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','123','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','123','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','123','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('712','04','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('712','04','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('740','00','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('740','00','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('706','04','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('706','04','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('706','04','122','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('704','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('704','03','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('704','03','122','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','03','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','03','066','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','030','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','030','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','030','066','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('710','30','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('710','30','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('710','300','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('710','300','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('714','02','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('714','02','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','06','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','06','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','06','105','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('748','07','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('748','07','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('734','04','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('734','04','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','03','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','30','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','30','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','33','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','33','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','840','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','840','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','840','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','840','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','854','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','854','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','854','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','854','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','855','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','855','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','855','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','855','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','856','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','856','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','856','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','856','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','857','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','857','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','857','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','857','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','858','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','858','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','858','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','858','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','859','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','859','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','859','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','859','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','860','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','860','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','860','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','860','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','861','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','861','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','861','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','861','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','862','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','862','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','862','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','862','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','863','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','863','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','863','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','863','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','864','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','864','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','864','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','864','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','865','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','865','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','865','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','865','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','866','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','866','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','866','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','866','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','867','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','867','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','867','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','867','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','868','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','868','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','868','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','868','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','869','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','869','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','869','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','869','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','870','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','870','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','870','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','870','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','871','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','871','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','871','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','871','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','872','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','872','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','872','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','872','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','873','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','873','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','873','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','873','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','874','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','874','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','874','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','874','108','','');
 CREATE TABLE qcril_emergency_source_voice_mcc_mnc_table(MCC TEXT, MNC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER,MNC));
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('466','92','119','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('466','92','110','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('230','03','150','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('230','03','155','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('230','03','158','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('722','310','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('722','310','101','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('722','310','107','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('748','10','104','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('744','02','128','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','128','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','153','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','180','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','181','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','185','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','188','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','190','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','191','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','192','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','193','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','194','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','197','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','198','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','199','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','120','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','122','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','123','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','125','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','128','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('706','01','133','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('706','01','122','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('714','03','103','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('714','03','104','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','111','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','113','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','116','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','195','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','198','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','199','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('710','21','115','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('710','21','128','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('730','03','133','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('730','23','133','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('716','10','105','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','840','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','840','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','840','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','840','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','854','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','854','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','854','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','854','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','855','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','855','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','855','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','855','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','856','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','856','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','856','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','856','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','857','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','857','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','857','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','857','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','858','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','858','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','858','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','858','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','859','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','859','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','859','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','859','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','860','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','860','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','860','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','860','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','861','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','861','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','861','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','861','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','862','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','862','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','862','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','862','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','863','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','863','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','863','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','863','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','864','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','864','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','864','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','864','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','865','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','865','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','865','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','865','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','866','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','866','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','866','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','866','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','867','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','867','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','867','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','867','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','868','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','868','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','868','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','868','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','869','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','869','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','869','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','869','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','870','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','870','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','870','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','870','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','871','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','871','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','871','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','871','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','872','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','872','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','872','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','872','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','873','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','873','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','873','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','873','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','874','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','874','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','874','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','874','108','','full');
 CREATE TABLE qcril_properties_table (property TEXT,value TEXT, PRIMARY KEY(property));
-INSERT INTO qcril_properties_table VALUES('qcrildb_version','3');
+INSERT INTO qcril_properties_table VALUES('qcrildb_version','5');
 CREATE TABLE qcril_operator_specific_config(MCC TEXT, MNC TEXT, WPS_OVER_CS INTEGER, PRIMARY KEY(MCC, MNC));
 INSERT INTO qcril_operator_specific_config VALUES('310','410',1);
 DELETE FROM qcril_operator_specific_config where MCC = '310' AND MNC = '410';
@@ -752,4 +537,180 @@ INSERT INTO qcril_cdma_operator_specific_config VALUES('460','11',1);
 INSERT INTO qcril_cdma_operator_specific_config VALUES('454','03',1);
 INSERT INTO qcril_cdma_operator_specific_config VALUES('454','31',1);
 INSERT INTO qcril_cdma_operator_specific_config VALUES('204','04',1);
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '108';
 COMMIT;
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql
index 29dccfb..6ad2990 100644
--- a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql
+++ b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql
@@ -141,25 +141,4 @@ DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC
 DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '102';
 DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '108';
 
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '222' AND NUMBER = '118';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '222' AND NUMBER = '119';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '260' AND NUMBER = '997';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '260' AND NUMBER = '998';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '260' AND NUMBER = '999';
-DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '260' AND NUMBER = '997';
-DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '260' AND NUMBER = '998';
-DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '260' AND NUMBER = '999';
-DELETE FROM qcril_emergency_source_escv_nw_table where MCC = '262' AND NUMBER = '110';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '262' AND NUMBER = '110';
-DELETE FROM qcril_emergency_source_voice_table where MCC = '262' AND NUMBER = '110';
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('262','110','','full');
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '230' AND MNC = '03' AND NUMBER = '150';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '230' AND MNC = '03' AND NUMBER = '155';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '230' AND MNC = '03' AND NUMBER = '158';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '230' AND NUMBER = '150';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '230' AND NUMBER = '155';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '230' AND NUMBER = '158';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '150';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '155';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '158';
 COMMIT TRANSACTION;
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql
index d2c877f..5fd1fa9 100644
--- a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql
+++ b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql
@@ -9,7 +9,5 @@ BEGIN TRANSACTION;
 INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 6);
 
 DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '262' AND NUMBER = '110';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '730' AND MNC = '02' AND NUMBER = '131';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '730' AND MNC = '02' AND NUMBER = '132';
 
 COMMIT TRANSACTION;
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
index 3054011..dedcb75 100644
--- a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
+++ b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
@@ -232,19 +232,4 @@ INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','197','
 INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','116000','','');
 INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','116117','','');
 
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '602';
-DELETE FROM qcril_emergency_source_voice_table where MCC = '602';
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','121','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','122','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','123','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','126','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','128','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','129','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','150','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','180','','full');
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '602' AND NUMBER = '120';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '602' AND NUMBER = '128';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '602' AND NUMBER = '150';
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','128','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','150','','');
 COMMIT TRANSACTION;
diff --git a/sdm660-common/sdm660-common-vendor.mk b/sdm660-common/sdm660-common-vendor.mk
index ac24c49..27cf5c0 100644
--- a/sdm660-common/sdm660-common-vendor.mk
+++ b/sdm660-common/sdm660-common-vendor.mk
@@ -6,49 +6,55 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/asus/sdm660-common
 
 PRODUCT_COPY_FILES += \
-    vendor/asus/sdm660-common/proprietary/framework/tcmclient.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/tcmclient.jar \
+    vendor/asus/sdm660-common/proprietary/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM)/bin/wfdservice \
+    vendor/asus/sdm660-common/proprietary/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/wfdservice.rc \
+    vendor/asus/sdm660-common/proprietary/etc/wfdconfig.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfig.xml \
+    vendor/asus/sdm660-common/proprietary/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfigsink.xml \
+    vendor/asus/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
     vendor/asus/sdm660-common/proprietary/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \
     vendor/asus/sdm660-common/proprietary/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \
     vendor/asus/sdm660-common/proprietary/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmosal.so \
     vendor/asus/sdm660-common/proprietary/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmparser_lite.so \
-    vendor/asus/sdm660-common/proprietary/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/fm_helium.so \
-    vendor/asus/sdm660-common/proprietary/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libfm-hci.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdavenhancements.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdavenhancements.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdclient.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdcodecv4l2.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdcodecv4l2.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdcommonutils.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdconfigutils.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfddisplayconfig.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfddisplayconfig.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmminterface.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmmsink.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdmmsrc.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmmsrc.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdnative.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdrtsp.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdservice.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdservice.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfdsm.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdsm.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcinterface.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsink.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsinkinterface.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrc.so \
+    vendor/asus/sdm660-common/proprietary/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrcinterface.so \
+    vendor/asus/sdm660-common/proprietary/lib64/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libFileMux.so \
+    vendor/asus/sdm660-common/proprietary/lib64/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libOmxMux.so \
     vendor/asus/sdm660-common/proprietary/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmmosal.so \
-    vendor/asus/sdm660-common/proprietary/product/framework/vendor.qti.hardware.soter-V1.0-java.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/vendor.qti.hardware.soter-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/product/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/com.qualcomm.qti.ant@1.0.so \
+    vendor/asus/sdm660-common/proprietary/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdclient.so \
+    vendor/asus/sdm660-common/proprietary/lib64/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdnative.so \
+    vendor/asus/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/telephony_product_privapp-permissions-qti.xml \
     vendor/asus/sdm660-common/proprietary/product/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptXHD_encoder.so \
     vendor/asus/sdm660-common/proprietary/product/lib64/libaptX_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptX_encoder.so \
-    vendor/asus/sdm660-common/proprietary/product/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/vendor.qti.hardware.fm@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM)/bin/wfdservice \
-    vendor/asus/sdm660-common/proprietary/system/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/wfdservice.rc \
-    vendor/asus/sdm660-common/proprietary/system/etc/wfdconfig.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfig.xml \
-    vendor/asus/sdm660-common/proprietary/system/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/wfdconfigsink.xml \
-    vendor/asus/sdm660-common/proprietary/system/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmrtpdecoder.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmrtpencoder.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdavenhancements.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdavenhancements.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdclient.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdcodecv4l2.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdcodecv4l2.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdcommonutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdcommonutils.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdconfigutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdconfigutils.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdmminterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmminterface.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdmmsink.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmmsink.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdmmsrc.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdmmsrc.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdnative.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdrtsp.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdrtsp.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdservice.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdservice.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfdsm.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfdsm.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfduibcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcinterface.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfduibcsink.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsink.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfduibcsinkinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsinkinterface.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrc.so \
-    vendor/asus/sdm660-common/proprietary/system/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrcinterface.so \
-    vendor/asus/sdm660-common/proprietary/system/lib64/libwfdclient.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdclient.so \
-    vendor/asus/sdm660-common/proprietary/system/lib64/libwfdnative.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libwfdnative.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/bin/diag_callback_sample_system:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/diag_callback_sample_system \
+    vendor/asus/sdm660-common/proprietary/system_ext/bin/diag_dci_sample_system:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/diag_dci_sample_system \
+    vendor/asus/sdm660-common/proprietary/system_ext/bin/diag_mdlog_system:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/diag_mdlog_system \
     vendor/asus/sdm660-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
     vendor/asus/sdm660-common/proprietary/system_ext/bin/nvram_btwifi:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/nvram_btwifi \
+    vendor/asus/sdm660-common/proprietary/system_ext/bin/test_diag_system:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/test_diag_system \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/cdma_call_conf.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/cdma_call_conf.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/RemoteSimlock.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/RemoteSimlockManager.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/UimGba.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/UimGbaManager.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/UimService.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/audiosphere.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/audiosphere.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml \
@@ -56,39 +62,23 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/embms-noship_product_privapp_permissions_qti.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/embms.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/embms.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/lpa.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_libpermissions.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.qti.dpmframework.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qti.dpmframework.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qualcomm.qti.uceservice-V2.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.qualcomm.qti.uceservice-V2.1-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.1-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.quicinc.cne.api-V1.1-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.quicinc.cne.constants-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.quicinc.cne.constants-V2.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.constants-V2.1-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.quicinc.cne.constants-V2.1-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/dpmapi.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/dpmapi.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/embmslibrary.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/embmslibrary.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/qcrilhook.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/qcrilhook.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/qti-telephony-common.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/qti-telephony-common.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.hardware.data.connection-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.hardware.data.connection-V1.1-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.ims.callcapability-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.ims.callinfo-V1.0-java.jar \
-    vendor/asus/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/uimremoteclient.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/uimremoteserver.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/spn-conf.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/spn-conf.xml \
+    vendor/asus/sdm660-common/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_whitelist_system_ext.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/lib/libadsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libadsprpc_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib/libcdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libcdsprpc_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib/libmdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmdsprpc_system.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmosal.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmparser_lite.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib/libsdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libsdsprpc_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
@@ -98,22 +88,56 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.uceservice@2.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.uceservice@2.1.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.uceservice@2.2.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.uceservice@2.3.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.api@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.api@1.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.constants@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.constants@2.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.quicinc.cne.constants@2.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/fm_helium.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/lib-imsvideocodec.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvideocodec.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtextutils.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtutils.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libDiagService.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libDiagService.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libadsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libadsprpc_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libcdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libcdsprpc_system.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdiag_system.qti.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.qti.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmctmgr.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmfdmgr.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdpmframework.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmframework.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmtcm.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libembmsmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libembmsmmosal.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libembmsmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libembmsmmparser_lite.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libembmssqlite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libembmssqlite.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libembmstinyxml.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libembmstinyxml.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libfm-hci.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libjnihelpers.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libjnihelpers.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmdsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libsdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libsdsprpc_system.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmink-sock-native-api.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libminksocket_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmi.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmi.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmosal.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmparser_lite.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpencoder.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmsp.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmwqemiptablemgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmwqemiptablemgr.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libqmi_cci_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libqmi_cci_system.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libqmi_encdec_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libqmi_encdec_system.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libsdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libsdsprpc_system.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libtrigger-handler.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libtrigger-handler.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libupdateprof.qti.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libupdateprof.qti.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@2.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@2.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@2.2.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.3.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@2.3.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.mwqem@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.mwqem@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.slm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.slm@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.diaghal@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so \
@@ -122,12 +146,55 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.connection@1.1.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.iwlan@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.iwlan@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.latency@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.lce@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.lce@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.embmssl@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.embmssl@1.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.fm@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.mwqemadapter@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.mwqemadapter@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.am@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.am@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.2.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.3.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.4.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.5.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.5.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.6.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.6.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.7.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.lpa@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.lpa@1.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim@1.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim@1.2.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.slmadapter@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.slmadapter@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callcapability@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.callcapability@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.callinfo@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.factory@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.factory@1.1.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsconfig@1.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsconfig@1.1.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsconfig@2.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsconfig@2.1.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.latency@2.0.so \
+    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.latency@2.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
     vendor/asus/sdm660-common/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
@@ -143,9 +210,11 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/android.hardware.keymaster@3.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@3.0-service-qti \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.esepowermanager@1.0-service \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.1-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.esepowermanager@1.1-service \
     vendor/asus/sdm660-common/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/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@2.0-service \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qseecom@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.soter@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti \
@@ -153,15 +222,20 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/bin/imsdatadaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsdatadaemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/imsqmidaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsqmidaemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/imsrcsd:$(TARGET_COPY_OUT_VENDOR)/bin/imsrcsd \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/ipacm-diag:$(TARGET_COPY_OUT_VENDOR)/bin/ipacm-diag \
     vendor/asus/sdm660-common/proprietary/vendor/bin/irsc_util:$(TARGET_COPY_OUT_VENDOR)/bin/irsc_util \
     vendor/asus/sdm660-common/proprietary/vendor/bin/loc_launcher:$(TARGET_COPY_OUT_VENDOR)/bin/loc_launcher \
     vendor/asus/sdm660-common/proprietary/vendor/bin/lowi-server:$(TARGET_COPY_OUT_VENDOR)/bin/lowi-server \
     vendor/asus/sdm660-common/proprietary/vendor/bin/msm_irqbalance:$(TARGET_COPY_OUT_VENDOR)/bin/msm_irqbalance \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/mutualex:$(TARGET_COPY_OUT_VENDOR)/bin/mutualex \
     vendor/asus/sdm660-common/proprietary/vendor/bin/netmgrd:$(TARGET_COPY_OUT_VENDOR)/bin/netmgrd \
     vendor/asus/sdm660-common/proprietary/vendor/bin/pd-mapper:$(TARGET_COPY_OUT_VENDOR)/bin/pd-mapper \
     vendor/asus/sdm660-common/proprietary/vendor/bin/pm-proxy:$(TARGET_COPY_OUT_VENDOR)/bin/pm-proxy \
     vendor/asus/sdm660-common/proprietary/vendor/bin/pm-service:$(TARGET_COPY_OUT_VENDOR)/bin/pm-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/port-bridge:$(TARGET_COPY_OUT_VENDOR)/bin/port-bridge \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/power_off_alarm:$(TARGET_COPY_OUT_VENDOR)/bin/power_off_alarm \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/qcc-trd:$(TARGET_COPY_OUT_VENDOR)/bin/qcc-trd \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/qmipriod:$(TARGET_COPY_OUT_VENDOR)/bin/qmipriod \
     vendor/asus/sdm660-common/proprietary/vendor/bin/qrtr-cfg:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-cfg \
     vendor/asus/sdm660-common/proprietary/vendor/bin/qrtr-lookup:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-lookup \
     vendor/asus/sdm660-common/proprietary/vendor/bin/qrtr-ns:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-ns \
@@ -170,16 +244,19 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/bin/rmt_storage:$(TARGET_COPY_OUT_VENDOR)/bin/rmt_storage \
     vendor/asus/sdm660-common/proprietary/vendor/bin/sensors.qti:$(TARGET_COPY_OUT_VENDOR)/bin/sensors.qti \
     vendor/asus/sdm660-common/proprietary/vendor/bin/slim_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/slim_daemon \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/ssgqmigd:$(TARGET_COPY_OUT_VENDOR)/bin/ssgqmigd \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/ssgtzd:$(TARGET_COPY_OUT_VENDOR)/bin/ssgtzd \
     vendor/asus/sdm660-common/proprietary/vendor/bin/tftp_server:$(TARGET_COPY_OUT_VENDOR)/bin/tftp_server \
     vendor/asus/sdm660-common/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
     vendor/asus/sdm660-common/proprietary/vendor/bin/time_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/time_daemon \
+    vendor/asus/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision:$(TARGET_COPY_OUT_VENDOR)/bin/vendor.qti.hardware.soter@1.0-provision \
     vendor/asus/sdm660-common/proprietary/vendor/bin/wifidisplayhalservice:$(TARGET_COPY_OUT_VENDOR)/bin/wifidisplayhalservice \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtra-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/xtra-daemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtwifi-client:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-client \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtwifi-inet-agent:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-inet-agent \
     vendor/asus/sdm660-common/proprietary/vendor/etc/cacert_location.pem:$(TARGET_COPY_OUT_VENDOR)/etc/cacert_location.pem \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/cne/profileSlm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/profileSlm.xml \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/cne/slm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/cne/slm.conf \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/cne/mwqem.conf:$(TARGET_COPY_OUT_VENDOR)/etc/cne/mwqem.conf \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/cne/profileMwqem.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/profileMwqem.xml \
     vendor/asus/sdm660-common/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile1.xml \
     vendor/asus/sdm660-common/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile2.xml \
     vendor/asus/sdm660-common/proprietary/vendor/etc/cne/wqeclient/ATT/ATT_profile3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/cne/wqeclient/ATT/ATT_profile3.xml \
@@ -223,18 +300,24 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/imsdatadaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdatadaemon.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/imsqmidaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsqmidaemon.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/imsrcsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsrcsd.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/init-qcril-data.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-qcril-data.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/init.qdmastats.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qdmastats.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/init.time_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.time_daemon.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/ipa_fws.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ipa_fws.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/ipacm-diag.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ipacm-diag.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/mutualex.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mutualex.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/port-bridge.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/port-bridge.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/qmipriod.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qmipriod.debug.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/qmipriod.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qmipriod.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/ssgtzd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ssgtzd.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.adsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.adsprpc-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.cdsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.cdsprpc-service.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.esepowermanager@1.0-service.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.esepowermanager@1.1-service.rc \
     vendor/asus/sdm660-common/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/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.dsp@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@2.0-service.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.soter@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc \
@@ -247,7 +330,10 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/atfwd@2.0.policy \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/qti-systemd.policy \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/vendor.qti.hardware.dsp.policy \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/ta_config.json \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/tz_whitelist.json \
     vendor/asus/sdm660-common/proprietary/vendor/etc/xtra_root_cert.pem:$(TARGET_COPY_OUT_VENDOR)/etc/xtra_root_cert.pem \
     vendor/asus/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \
@@ -259,9 +345,10 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_esx.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/activity_recognition.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/activity_recognition.sdm660.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/android.hardware.keymaster@3.0-impl-qti.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/hw/com.dsi.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/com.dsi.ant@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/sensors.sdm660_64.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/sensors.sdm660_64.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/sound_trigger.primary.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/sound_trigger.primary.sdm660.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.esepowermanager@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.esepowermanager@1.0-impl.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/vulkan.adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vulkan.adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAlacSwDec.so \
@@ -285,6 +372,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxWmaDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxWmaDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOpenCL.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib/libQSEEComAPI.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libQTEEConnector_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libQTEEConnector_vendor.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libacdb-fts.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdb-fts.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libacdbloader.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdbloader.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libacdbrtac.so:$(TARGET_COPY_OUT_VENDOR)/lib/libacdbrtac.so \
@@ -303,7 +391,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libdiag.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdiag.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libdrc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdrc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libdsd2pcm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsd2pcm.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libdsutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsutils.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libfastcvdsp_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfastcvdsp_stub.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libfastcvopt.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfastcvopt.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libgcs-calwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgcs-calwrapper.so \
@@ -320,25 +407,27 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libllvm-qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib/libllvm-qcom.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmdmdetect.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdmdetect.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdsprpc.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libminkdescriptor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libminkdescriptor.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmm-color-convertor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-color-convertor.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmm-hdcpmgr.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmmosal_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal_proprietary.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfconfig.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libperfgluelayer.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libpn553_fw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libpn553_fw.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqcci_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqcci_legacy.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdi.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqdp.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi_cci.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_cci.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi_client_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_client_helper.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi_client_qmux.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_client_qmux.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi_common_so.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_common_so.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_csi.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi_csvt_srvc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_csvt_srvc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_encdec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libqmi_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_legacy.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmiservices.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libqrtr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqrtr.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqseed3.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqsocket.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd-client.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-util.so \
@@ -353,11 +442,14 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdsprpc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsensor1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsensor1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsensor_reg.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsensor_reg.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libsmemlog.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsmemlog.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsmwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsmwrapper.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsysmon_cdsp_skel.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsystem_health_mon.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtinyxml2_1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libvqzip.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvqzip.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdcommonutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdcommonutils_proprietary.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfddisplayconfig_proprietary.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdhaldsmanager.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhaldsmanager.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdhdcpcp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdhdcpcp.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libwfdmmservice.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmmservice.so \
@@ -384,10 +476,10 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/soundfx/libqcbassboost.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcbassboost.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/soundfx/libqcreverb.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcreverb.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/soundfx/libqcvirt.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libqcvirt.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/vendor.qti.esepowermanager@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.esepowermanager@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.dsp@1.0.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.qseecom@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qteeconnector@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.qteeconnector@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.ant@1.0.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.tui_comm@1.0.so \
     vendor/asus/sdm660-common/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/asus/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.imscmservice@2.0.so \
@@ -396,6 +488,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.2.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qualcomm.qti.uceservice@2.3.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/deviceInfoServiceModule.so:$(TARGET_COPY_OUT_VENDOR)/lib64/deviceInfoServiceModule.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/eglSubDriverAndroid.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/egl/libEGL_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libEGL_adreno.so \
@@ -407,14 +500,17 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.dsi.ant@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/sensors.sdm660_64.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/sensors.sdm660_64.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@3.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@3.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vulkan.adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vulkan.adreno.so \
@@ -437,6 +533,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libGPreqcancel_svc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel_svc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOpenCL.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQSEEComAPI.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libQTEEConnector_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQTEEConnector_vendor.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libSecureUILib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSecureUILib.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libStDrvInt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libStDrvInt.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libacdb-fts.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libacdb-fts.so \
@@ -449,8 +546,11 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libaudcal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaudcal.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libaudioalsa.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaudioalsa.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libaudioparsers.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaudioparsers.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libbase64.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbase64.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libbt-hidlclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbt-hidlclient.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libbtnv.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbtnv.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libc2d30_bltlib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc2d30_bltlib.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libcacertclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcacertclient.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libcdsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsp_default_listener.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libcdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcdsprpc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libcne.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcne.so \
@@ -473,6 +573,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libidl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libizat_client_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libizat_client_api.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libizat_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libizat_core.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libjnihelper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjnihelper.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libkeymasterdeviceutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterdeviceutils.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libkeymasterprovision.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterprovision.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libkeymasterutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterutils.so \
@@ -489,23 +590,26 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmdsprpc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libminkdescriptor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminkdescriptor.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmm-hdcpmgr.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmosal.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libnative-api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnative-api.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr_common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_common.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr_nr_fusion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_nr_fusion.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_rmnet_ext.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnlnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnlnetmgr.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/liboemaids_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liboemaids_vendor.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libpdmapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdmapper.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libpdnotifier.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpdnotifier.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libperfconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfconfig.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libperfgluelayer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperfgluelayer.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libperipheral_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libperipheral_client.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libqcbor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcbor.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqcci_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcci_legacy.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqcmaputils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcmaputils.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqcrilFramework.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrilFramework.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqcrildatactl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrildatactl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdi.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdma_file_agent.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdma_file_agent.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdp.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqisl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqisl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi.so \
@@ -514,8 +618,10 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmi_client_qmux.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_client_qmux.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmi_common_so.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_common_so.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmi_csi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_csi.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmi_csvt_srvc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_csvt_srvc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmi_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_encdec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmi_legacy.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi_legacy.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmiextservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmiextservices.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmiservices.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqrtr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqrtr.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqseed3.so \
@@ -531,6 +637,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libril-qc-radioconfig.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-radioconfig.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libril-qcril-hook-oem.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qcril-hook-oem.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/librilqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librilqmiservices.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/librmp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librmp.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/librpmb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librpmb.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/librs_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librs_adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libscalar.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libscalar.so \
@@ -540,16 +647,20 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsdm-disp-vndapis.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdm-disp-vndapis.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsdmextension.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdmextension.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdsprpc.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libsecureui.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsecureui.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsecureui_svcsock.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsecureui_svcsock.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsensor1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensor1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsensor_reg.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensor_reg.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsettings.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsettings.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libsi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsi.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libslimclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libslimclient.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libsmemlog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsmemlog.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libssd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssd.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsysmon_cdsp_skel.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsystem_health_mon.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/libtime_genoff.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtime_genoff.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtinyxml2_1.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libtzdrmgenprov.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtzdrmgenprov.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libwfdhdcpcp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwfdhdcpcp.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libwms.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwms.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libwqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwqe.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwvhidl.so \
@@ -566,8 +677,11 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/soundfx/libqcvirt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libqcvirt.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.1.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.2.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.mwqem@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.slm@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.esepowermanager@1.0.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.esepowermanager@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.2.so \
@@ -577,6 +691,8 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@3.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.alarm@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.cacert@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so \
@@ -588,6 +704,10 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.dsp@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fm@1.0.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.mwqemadapter@1.0.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qccvndhal@1.0.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qseecom@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qteeconnector@1.0.so \
     vendor/asus/sdm660-common/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/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so \
@@ -598,8 +718,10 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/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/asus/sdm660-common/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/asus/sdm660-common/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/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.7.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so \
     vendor/asus/sdm660-common/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/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.lpa@1.1.so \
     vendor/asus/sdm660-common/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/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so \
@@ -607,6 +729,8 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.uim@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.uim@1.2.so \
@@ -623,6 +747,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@2.0.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.rcsconfig@2.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.imsrtpservice@3.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.0.so \
@@ -637,26 +762,97 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
 
 PRODUCT_PACKAGES += \
-    libantradio \
     libthermalclient \
-    com.quicinc.cne.api@1.0 \
-    com.quicinc.cne.api@1.1 \
-    com.quicinc.cne.constants@1.0 \
-    com.quicinc.cne.constants@2.0 \
-    com.quicinc.cne.constants@2.1 \
+    libtime_genoff \
     WfdService \
+    CACertService \
     CneApp \
     IWlanService \
+    QCC-TR-UI \
     TimeService \
-    PowerOffAlarm \
+    CallFeaturesSetting \
+    ConfURIDialer \
+    ConferenceDialer \
     DeviceInfo \
+    DeviceStatisticsService \
+    DynamicDDSService \
+    NetworkSetting \
+    QTIDiagServices \
     QtiTelephonyService \
+    SimContact \
+    SimSettings \
+    atfwd \
     datastatusnotification \
     embms \
     imssettings \
+    remoteSimLockAuthentication \
+    remotesimlockservice \
+    uceShimService \
+    uimgbaservice \
+    uimlpaservice \
+    uimremoteclient \
+    uimremoteserver \
+    xdivert \
+    QAS_DVC_MSP \
     dpmserviceapp \
     ims \
     qcrilmsgtunnel \
     WfdCommon \
+    tcmclient \
+    ActivityExt \
     audiosphere \
+    com.qti.dpmframework \
+    com.qualcomm.qti.imscmservice-V2.0-java \
+    com.qualcomm.qti.imscmservice-V2.1-java \
+    com.qualcomm.qti.imscmservice-V2.2-java \
+    com.qualcomm.qti.uceservice-V2.0-java \
+    com.qualcomm.qti.uceservice-V2.1-java \
+    com.qualcomm.qti.uceservice-V2.2-java \
+    com.qualcomm.qti.uceservice-V2.3-java \
+    com.quicinc.cne.api-V1.0-java \
+    com.quicinc.cne.api-V1.1-java \
+    com.quicinc.cne.constants-V1.0-java \
+    com.quicinc.cne.constants-V2.0-java \
+    com.quicinc.cne.constants-V2.1-java \
+    dpmapi \
+    embmslibrary \
+    qcrilhook \
+    qti-telephony-common \
+    remotesimlockmanagerlibrary \
+    uimgbalibrary \
+    uimgbamanagerlibrary \
+    uimlpalibrary \
+    uimremoteclientlibrary \
+    uimremoteserverlibrary \
+    uimremotesimlocklibrary \
+    uimservicelibrary \
+    vendor.qti.data.factory-V1.0-java \
+    vendor.qti.data.factory-V2.0-java \
+    vendor.qti.data.factory-V2.1-java \
+    vendor.qti.data.factory-V2.2-java \
+    vendor.qti.data.factory-V2.3-java \
+    vendor.qti.data.mwqem-V1.0-java \
+    vendor.qti.data.slm-V1.0-java \
+    vendor.qti.hardware.data.cne.internal.api-V1.0-java \
+    vendor.qti.hardware.data.cne.internal.constants-V1.0-java \
+    vendor.qti.hardware.data.cne.internal.server-V1.0-java \
+    vendor.qti.hardware.data.connection-V1.0-java \
+    vendor.qti.hardware.data.connection-V1.1-java \
+    vendor.qti.hardware.data.dynamicdds-V1.0-java \
+    vendor.qti.hardware.data.iwlan-V1.0-java \
+    vendor.qti.hardware.data.latency-V1.0-java \
+    vendor.qti.hardware.data.lce-V1.0-java \
+    vendor.qti.hardware.data.qmi-V1.0-java \
+    vendor.qti.hardware.mwqemadapter-V1.0-java \
+    vendor.qti.hardware.slmadapter-V1.0-java \
+    vendor.qti.ims.callcapability-V1.0-java \
+    vendor.qti.ims.callinfo-V1.0-java \
+    vendor.qti.ims.factory-V1.0-java \
+    vendor.qti.ims.factory-V1.1-java \
+    vendor.qti.ims.rcsconfig-V1.0-java \
+    vendor.qti.ims.rcsconfig-V1.1-java \
+    vendor.qti.ims.rcsconfig-V2.0-java \
+    vendor.qti.ims.rcsconfig-V2.1-java \
+    vendor.qti.latency-V2.0-java \
+    vendor.qti.latency-V2.1-java \
     vendor.qti.gnss@3.0-service