diff --git a/X00TD/Android.bp b/X00TD/Android.bp
index 443fca6..6e3d7f3 100644
--- a/X00TD/Android.bp
+++ b/X00TD/Android.bp
@@ -5,3 +5,10 @@
 soong_namespace {
 }
 
+dex_import {
+	name: "vendor.qti.hardware.fingerprint-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/product/framework/vendor.qti.hardware.fingerprint-V1.0-java.jar"],
+	product_specific: true,
+}
+
diff --git a/X00TD/X00TD-vendor.mk b/X00TD/X00TD-vendor.mk
index 6759ffe..2702593 100644
--- a/X00TD/X00TD-vendor.mk
+++ b/X00TD/X00TD-vendor.mk
@@ -6,7 +6,6 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/asus/X00TD
 
 PRODUCT_COPY_FILES += \
-    vendor/asus/X00TD/proprietary/product/framework/vendor.qti.hardware.fingerprint-V1.0-java.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/vendor.qti.hardware.fingerprint-V1.0-java.jar \
     vendor/asus/X00TD/proprietary/vendor/bin/qfp-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/qfp-daemon \
     vendor/asus/X00TD/proprietary/vendor/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb \
     vendor/asus/X00TD/proprietary/vendor/etc/acdbdata/MTP/MTP_General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/MTP/MTP_General_cal.acdb \
@@ -652,3 +651,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/X00TD/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0-service.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvendor.goodix.hardware.fingerprint@1.0-service.so \
     vendor/asus/X00TD/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvendor.goodix.hardware.fingerprint@1.0.so \
     vendor/asus/X00TD/proprietary/vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fingerprint@1.0.so
+
+PRODUCT_PACKAGES += \
+    vendor.qti.hardware.fingerprint-V1.0-java
diff --git a/X00TD/proprietary/vendor/etc/calmodule.cfg b/X00TD/proprietary/vendor/etc/calmodule.cfg
deleted file mode 100755
index 60a9f57..0000000
--- a/X00TD/proprietary/vendor/etc/calmodule.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-libcalmodule_common.so
-libcalmodule_gyroscope.so
-libcalmodule_qti_algo.so
diff --git a/X00TD/proprietary/vendor/etc/sensors/sensor_def_qcomdev.conf b/X00TD/proprietary/vendor/etc/sensors/sensor_def_qcomdev.conf
index 6473378..3173669 100644
--- a/X00TD/proprietary/vendor/etc/sensors/sensor_def_qcomdev.conf
+++ b/X00TD/proprietary/vendor/etc/sensors/sensor_def_qcomdev.conf
@@ -5810,49 +5810,49 @@
 # SSC GPIO CFG (Unused)
 #-----------------------------
 #
-6300       1 0x00010001 # version
-6301  0x0104 0x00010001 # gpio num
-6302       2 0x00010001 # active func sel
-6303       1 0x00010001 # active dir
-6304       0 0x00010001 # active pull
-6305       3 0x00010001 # active drive
-6306       2 0x00010001 # inactive func sel
-6307       0 0x00010001 # inactive dir
-6308       2 0x00010001 # inactive pull
-6309       3 0x00010001 # inactive drive
+#6300       1 0x00010001 # version
+#6301  0x0104 0x00010001 # gpio num
+#6302       2 0x00010001 # active func sel
+#6303       1 0x00010001 # active dir
+#6304       0 0x00010001 # active pull
+#6305       3 0x00010001 # active drive
+#6306       2 0x00010001 # inactive func sel
+#6307       0 0x00010001 # inactive dir
+#6308       2 0x00010001 # inactive pull
+#6309       3 0x00010001 # inactive drive
 
-6310       1 0x00010001 # version
-6311  0x0105 0x00010001 # gpio num
-6312       2 0x00010001 # active func sel
-6313       1 0x00010001 # active dir
-6314       0 0x00010001 # active pull
-6315       3 0x00010001 # active drive
-6316       2 0x00010001 # inactive func sel
-6317       0 0x00010001 # inactive dir
-6318       2 0x00010001 # inactive pull
-6319       3 0x00010001 # inactive drive
+#6310       1 0x00010001 # version
+#6311  0x0105 0x00010001 # gpio num
+#6312       2 0x00010001 # active func sel
+#6313       1 0x00010001 # active dir
+#6314       0 0x00010001 # active pull
+#6315       3 0x00010001 # active drive
+#6316       2 0x00010001 # inactive func sel
+#6317       0 0x00010001 # inactive dir
+#6318       2 0x00010001 # inactive pull
+#6319       3 0x00010001 # inactive drive
 
-6320       1 0x00010001 # version
-6321  0x0106 0x00010001 # gpio num
-6322       2 0x00010001 # active func sel
-6323       1 0x00010001 # active dir
-6324       0 0x00010001 # active pull
-6325       3 0x00010001 # active drive
-6326       2 0x00010001 # inactive func sel
-6327       0 0x00010001 # inactive dir
-6328       2 0x00010001 # inactive pull
-6329       3 0x00010001 # inactive drive
+#6320       1 0x00010001 # version
+#6321  0x0106 0x00010001 # gpio num
+#6322       2 0x00010001 # active func sel
+#6323       1 0x00010001 # active dir
+#6324       0 0x00010001 # active pull
+#6325       3 0x00010001 # active drive
+#6326       2 0x00010001 # inactive func sel
+#6327       0 0x00010001 # inactive dir
+#6328       2 0x00010001 # inactive pull
+#6329       3 0x00010001 # inactive drive
 
-6330       1 0x00010001 # version
-6331  0x0107 0x00010001 # gpio num
-6332       2 0x00010001 # active func sel
-6333       0 0x00010001 # active dir
-6334       0 0x00010001 # active pull
-6335       3 0x00010001 # active drive
-6336       2 0x00010001 # inactive func sel
-6337       0 0x00010001 # inactive dir
-6338       2 0x00010001 # inactive pull
-6339       3 0x00010001 # inactive drive
+#6330       1 0x00010001 # version
+#6331  0x0107 0x00010001 # gpio num
+#6332       2 0x00010001 # active func sel
+#6333       0 0x00010001 # active dir
+#6334       0 0x00010001 # active pull
+#6335       3 0x00010001 # active drive
+#6336       2 0x00010001 # inactive func sel
+#6337       0 0x00010001 # inactive dir
+#6338       2 0x00010001 # inactive pull
+#6339       3 0x00010001 # inactive drive
 
 6340       1 0x00010001 # version
 6341  0x010C 0x00010001 # gpio num
diff --git a/X00TD/proprietary/vendor/lib/libcalmodule_common.so b/X00TD/proprietary/vendor/lib/libcalmodule_common.so
deleted file mode 100755
index e0626ec..0000000
Binary files a/X00TD/proprietary/vendor/lib/libcalmodule_common.so and /dev/null differ
diff --git a/X00TD/proprietary/vendor/lib64/libcalmodule_common.so b/X00TD/proprietary/vendor/lib64/libcalmodule_common.so
deleted file mode 100755
index 34f8d34..0000000
Binary files a/X00TD/proprietary/vendor/lib64/libcalmodule_common.so and /dev/null differ
diff --git a/sdm660-common/Android.bp b/sdm660-common/Android.bp
index 8253505..d015b28 100644
--- a/sdm660-common/Android.bp
+++ b/sdm660-common/Android.bp
@@ -59,7 +59,6 @@ android_app_import {
 	name: "CneApp",
 	owner: "asus",
 	apk: "proprietary/vendor/app/CneApp/CneApp.apk",
-	required: ["CneApp.libvndfwk_detect_jni.qti_symlink"],
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -90,20 +89,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "uimremoteclient",
+	name: "DeviceStatisticsService",
 	owner: "asus",
-	apk: "proprietary/product/app/uimremoteclient/uimremoteclient.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "MotoSignatureApp",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/MotoSignatureApp/MotoSignatureApp.apk",
+	apk: "proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -112,64 +100,31 @@ android_app_import {
 }
 
 android_app_import {
-	name: "uimremoteserver",
+	name: "QtiTelephonyService",
 	owner: "asus",
-	apk: "proprietary/product/app/uimremoteserver/uimremoteserver.apk",
+	apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "remoteSimLockAuthentication",
 	owner: "asus",
-	apk: "proprietary/product/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk",
+	apk: "proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "remotesimlockservice",
 	owner: "asus",
-	apk: "proprietary/product/app/remotesimlockservice/remotesimlockservice.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "uimlpaservice",
-	owner: "asus",
-	apk: "proprietary/product/app/uimlpaservice/uimlpaservice.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "xdivert",
-	owner: "asus",
-	apk: "proprietary/product/app/xdivert/xdivert.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "QtiTelephonyService",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk",
+	apk: "proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -189,46 +144,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "MotoDolbyDax3",
+	name: "uimgbaservice",
 	owner: "asus",
-	apk: "proprietary/system_ext/priv-app/MotoDolbyDax3/MotoDolbyDax3.apk",
-	overrides: ["MusicFX"],
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "MotorolaSettingsProvider",
-	owner: "asus",
-	apk: "proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "daxService",
-	owner: "asus",
-	apk: "proprietary/system_ext/priv-app/daxService/daxService.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "DynamicDDSService",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk",
+	apk: "proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -237,9 +155,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "ImsDataChannelService",
+	name: "uimlpaservice",
 	owner: "asus",
-	apk: "proprietary/system_ext/app/ImsDataChannelService/ImsDataChannelService.apk",
+	apk: "proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -248,9 +166,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "ImsRcsService",
+	name: "uimremoteclient",
 	owner: "asus",
-	apk: "proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk",
+	apk: "proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -259,27 +177,25 @@ android_app_import {
 }
 
 android_app_import {
-	name: "HotwordEnrollmentOKGoogleHEXAGON",
+	name: "uimremoteserver",
 	owner: "asus",
-	apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk",
+	apk: "proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
-	name: "HotwordEnrollmentXGoogleHEXAGON",
+	name: "xdivert",
 	owner: "asus",
-	apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk",
+	apk: "proprietary/system_ext/app/xdivert/xdivert.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
@@ -312,76 +228,6 @@ dex_import {
 	jars: ["proprietary/system/framework/tcmclient.jar"],
 }
 
-dex_import {
-	name: "remotesimlockmanagerlibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/remotesimlockmanagerlibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimgbalibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimgbalibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimgbamanagerlibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimgbamanagerlibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "com.motorola.frameworks.core.addon",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/com.motorola.frameworks.core.addon.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "com.motorola.motosignature",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/com.motorola.motosignature.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "uimlpalibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimlpalibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimremoteclientlibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimremoteclientlibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimremoteserverlibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimremoteserverlibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimremotesimlocklibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimremotesimlocklibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimservicelibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimservicelibrary.jar"],
-	product_specific: true,
-}
-
 dex_import {
 	name: "ActivityExt",
 	owner: "asus",
@@ -494,34 +340,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "datachannellib",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/datachannellib.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "moto-checkin",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/moto-checkin.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "moto-settings",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/moto-settings.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "moto",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/moto.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "qcrilhook",
 	owner: "asus",
@@ -536,6 +354,62 @@ dex_import {
 	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",
@@ -571,20 +445,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.data.factory-V2.4-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.4-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.data.factory-V2.5-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.5-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.data.mwqem-V1.0-java",
 	owner: "asus",
@@ -620,20 +480,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.hardware.data.cne.internal.server-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.hardware.data.cne.internal.server-V1.2-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.2-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.hardware.data.connection-V1.0-java",
 	owner: "asus",
@@ -655,27 +501,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.hardware.data.dynamicdds-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.hardware.data.flow-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.hardware.data.flow-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.hardware.data.iwlan-V1.0-java",
 	owner: "asus",
@@ -683,13 +508,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.hardware.data.iwlan-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.hardware.data.latency-V1.0-java",
 	owner: "asus",
@@ -753,27 +571,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.ims.factory-V2.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.factory-V2.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.factory-V2.2-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.ims.rcsconfig-V1.0-java",
 	owner: "asus",
@@ -802,76 +599,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.ims.configservice-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.configservice-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.connection-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.datachannelservice-V1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.datachannelservice-V1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcssip-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcssip-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcssip-V1.2-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcsuce-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcsuce-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcsuce-V1.2-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.latency-V2.0-java",
 	owner: "asus",
@@ -879,20 +606,6 @@ dex_import {
 	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,
-}
-
-dex_import {
-	name: "vendor.qti.latency-V2.2-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.latency-V2.2-java.jar"],
-	system_ext_specific: true,
-}
-
 prebuilt_etc_xml {
 	name: "manifest_android.hardware.drm@1.3-service.widevine",
 	owner: "asus",
diff --git a/sdm660-common/proprietary/odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service b/sdm660-common/proprietary/odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service
deleted file mode 100644
index e69de29..0000000
diff --git a/sdm660-common/proprietary/product/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk b/sdm660-common/proprietary/product/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk
deleted file mode 100644
index d690252..0000000
Binary files a/sdm660-common/proprietary/product/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/app/remotesimlockservice/remotesimlockservice.apk b/sdm660-common/proprietary/product/app/remotesimlockservice/remotesimlockservice.apk
deleted file mode 100644
index dcb43b7..0000000
Binary files a/sdm660-common/proprietary/product/app/remotesimlockservice/remotesimlockservice.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/app/uimlpaservice/uimlpaservice.apk b/sdm660-common/proprietary/product/app/uimlpaservice/uimlpaservice.apk
deleted file mode 100644
index 9ff3b27..0000000
Binary files a/sdm660-common/proprietary/product/app/uimlpaservice/uimlpaservice.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/app/uimremoteclient/uimremoteclient.apk b/sdm660-common/proprietary/product/app/uimremoteclient/uimremoteclient.apk
deleted file mode 100644
index 3071b67..0000000
Binary files a/sdm660-common/proprietary/product/app/uimremoteclient/uimremoteclient.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/app/uimremoteserver/uimremoteserver.apk b/sdm660-common/proprietary/product/app/uimremoteserver/uimremoteserver.apk
deleted file mode 100644
index 66031ab..0000000
Binary files a/sdm660-common/proprietary/product/app/uimremoteserver/uimremoteserver.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/app/xdivert/xdivert.apk b/sdm660-common/proprietary/product/app/xdivert/xdivert.apk
deleted file mode 100644
index c8b5adb..0000000
Binary files a/sdm660-common/proprietary/product/app/xdivert/xdivert.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml b/sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml
deleted file mode 100644
index 18019c6..0000000
--- a/sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2018-2019 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
-    <library name="vendor.qti.hardware.data.connection-V1.0-java"
-            file="/system/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar" />
-</permissions>
diff --git a/sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml b/sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml
deleted file mode 100644
index a26c550..0000000
--- a/sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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="vendor.qti.hardware.data.connection-V1.1-java"
-            file="/system/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar" />
-</permissions>
diff --git a/sdm660-common/proprietary/product/framework/remotesimlockmanagerlibrary.jar b/sdm660-common/proprietary/product/framework/remotesimlockmanagerlibrary.jar
deleted file mode 100644
index 3a07f21..0000000
Binary files a/sdm660-common/proprietary/product/framework/remotesimlockmanagerlibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/framework/uimgbalibrary.jar b/sdm660-common/proprietary/product/framework/uimgbalibrary.jar
deleted file mode 100644
index 7b61719..0000000
Binary files a/sdm660-common/proprietary/product/framework/uimgbalibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/framework/uimgbamanagerlibrary.jar b/sdm660-common/proprietary/product/framework/uimgbamanagerlibrary.jar
deleted file mode 100644
index a56d88e..0000000
Binary files a/sdm660-common/proprietary/product/framework/uimgbamanagerlibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/framework/uimlpalibrary.jar b/sdm660-common/proprietary/product/framework/uimlpalibrary.jar
deleted file mode 100644
index 03ac51d..0000000
Binary files a/sdm660-common/proprietary/product/framework/uimlpalibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/framework/uimremoteclientlibrary.jar b/sdm660-common/proprietary/product/framework/uimremoteclientlibrary.jar
deleted file mode 100644
index e7b4345..0000000
Binary files a/sdm660-common/proprietary/product/framework/uimremoteclientlibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/framework/uimremoteserverlibrary.jar b/sdm660-common/proprietary/product/framework/uimremoteserverlibrary.jar
deleted file mode 100644
index 026bbaf..0000000
Binary files a/sdm660-common/proprietary/product/framework/uimremoteserverlibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/framework/uimremotesimlocklibrary.jar b/sdm660-common/proprietary/product/framework/uimremotesimlocklibrary.jar
deleted file mode 100644
index a01049c..0000000
Binary files a/sdm660-common/proprietary/product/framework/uimremotesimlocklibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/framework/uimservicelibrary.jar b/sdm660-common/proprietary/product/framework/uimservicelibrary.jar
deleted file mode 100644
index b151a75..0000000
Binary files a/sdm660-common/proprietary/product/framework/uimservicelibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk b/sdm660-common/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk
deleted file mode 100644
index 31ca6ae..0000000
Binary files a/sdm660-common/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk b/sdm660-common/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk
deleted file mode 100644
index 3fe21f5..0000000
Binary files a/sdm660-common/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system/framework/tcmclient.jar b/sdm660-common/proprietary/system/framework/tcmclient.jar
index af33f3b..00204a5 100644
Binary files a/sdm660-common/proprietary/system/framework/tcmclient.jar and b/sdm660-common/proprietary/system/framework/tcmclient.jar 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
deleted file mode 100644
index dfefa42..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/ImsDataChannelService/ImsDataChannelService.apk b/sdm660-common/proprietary/system_ext/app/ImsDataChannelService/ImsDataChannelService.apk
deleted file mode 100644
index be5f96d..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/ImsDataChannelService/ImsDataChannelService.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk b/sdm660-common/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk
deleted file mode 100644
index 6eeec6f..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/MotoSignatureApp/MotoSignatureApp.apk b/sdm660-common/proprietary/system_ext/app/MotoSignatureApp/MotoSignatureApp.apk
deleted file mode 100644
index 296d045..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/MotoSignatureApp/MotoSignatureApp.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk b/sdm660-common/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
old mode 100644
new mode 100755
index 759e3e9..662d2fd
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/remoteSimLockAuthentication/remoteSimLockAuthentication.apk b/sdm660-common/proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk
new file mode 100755
index 0000000..e83f50f
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
old mode 100644
new mode 100755
index 341b5a9..c830eaf
Binary files a/sdm660-common/proprietary/system_ext/app/uceShimService/uceShimService.apk 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 100755
index 0000000..3152c24
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 100755
index 0000000..fb83021
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 100755
index 0000000..125bb60
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 100755
index 0000000..bb2b988
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/xdivert/xdivert.apk differ
diff --git a/sdm660-common/proprietary/product/etc/permissions/RemoteSimlock.xml b/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml
similarity index 80%
rename from sdm660-common/proprietary/product/etc/permissions/RemoteSimlock.xml
rename to sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml
index 535694b..e3dfa1b 100644
--- a/sdm660-common/proprietary/product/etc/permissions/RemoteSimlock.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml
@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.qti.remoteSimlock.uimremotesimlocklibrary"
-          file="/product/framework/uimremotesimlocklibrary.jar"/>
+          file="/system_ext/framework/uimremotesimlocklibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/product/etc/permissions/RemoteSimlockManager.xml b/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml
similarity index 84%
rename from sdm660-common/proprietary/product/etc/permissions/RemoteSimlockManager.xml
rename to sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml
index 408045a..ac1bfb4 100644
--- a/sdm660-common/proprietary/product/etc/permissions/RemoteSimlockManager.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml
@@ -7,6 +7,6 @@
 
 <permissions>
  <library name="com.qualcomm.qti.remoteSimlock.manager.remotesimlockmanagerlibrary"
-          file="/product/framework/remotesimlockmanagerlibrary.jar"
+          file="/system_ext/framework/remotesimlockmanagerlibrary.jar"
           dependency="com.qualcomm.qti.remoteSimlock.uimremotesimlocklibrary"/>
 </permissions>
diff --git a/sdm660-common/proprietary/product/etc/permissions/UimGba.xml b/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml
similarity index 82%
rename from sdm660-common/proprietary/product/etc/permissions/UimGba.xml
rename to sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml
index be261ae..159bd77 100644
--- a/sdm660-common/proprietary/product/etc/permissions/UimGba.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml
@@ -6,5 +6,5 @@
 -->
 <permissions>
  <library name="com.qualcomm.qti.uimGba.uimgbalibrary"
-          file="/product/framework/uimgbalibrary.jar"/>
+          file="/system_ext/framework/uimgbalibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/product/etc/permissions/UimGbaManager.xml b/sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml
similarity index 84%
rename from sdm660-common/proprietary/product/etc/permissions/UimGbaManager.xml
rename to sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml
index 4e0c875..749da23 100644
--- a/sdm660-common/proprietary/product/etc/permissions/UimGbaManager.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml
@@ -6,6 +6,6 @@
 -->
 <permissions>
  <library name="com.qualcomm.qti.uimGbaManager.uimgbamanagerlibrary"
-          file="/product/framework/uimgbamanagerlibrary.jar"
+          file="/system_ext/framework/uimgbamanagerlibrary.jar"
           dependency="com.qualcomm.qti.uimGba.uimgbalibrary"/>
 </permissions>
diff --git a/sdm660-common/proprietary/product/etc/permissions/UimService.xml b/sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml
similarity index 70%
rename from sdm660-common/proprietary/product/etc/permissions/UimService.xml
rename to sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml
index 0028367..6d8ad89 100644
--- a/sdm660-common/proprietary/product/etc/permissions/UimService.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml
@@ -7,6 +7,6 @@
 
 <permissions>
  <library name="com.qualcomm.qti.uim.uimservicelibrary"
-          file="/product/framework/uimservicelibrary.jar"
-          dependency="qti-telephony-hidl-wrapper-prd"/>
+          file="/system_ext/framework/uimservicelibrary.jar"
+          dependency="qti-telephony-hidl-wrapper"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml b/sdm660-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
deleted file mode 100644
index 96b76a7..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<permissions>
-    <library name="com.android.hotwordenrollment.common.util" file="/system_ext/framework/com.android.hotwordenrollment.common.util.jar"/>
-</permissions>
-
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.frameworks.core.addon.xml b/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.frameworks.core.addon.xml
deleted file mode 100644
index d940ea2..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.frameworks.core.addon.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="com.motorola.frameworks.core.addon"
-        file="/system_ext/framework/com.motorola.frameworks.core.addon.jar"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.motosignature.xml b/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.motosignature.xml
deleted file mode 100644
index 5b1d884..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.motosignature.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="com.motorola.motosignature"
-        file="/system_ext/framework/com.motorola.motosignature.jar"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.software.dolbyui.xml b/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.software.dolbyui.xml
deleted file mode 100644
index 142ff07..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.software.dolbyui.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <feature name="com.motorola.software.dolbyui"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/datachannellib.xml b/sdm660-common/proprietary/system_ext/etc/permissions/datachannellib.xml
deleted file mode 100644
index 29d56b0..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/datachannellib.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (c) 2022 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
- <library name="datachannellib"
-          file="/system_ext/framework/datachannellib.jar"/>
-</permissions>
diff --git a/sdm660-common/proprietary/product/etc/permissions/lpa.xml b/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml
similarity index 82%
rename from sdm660-common/proprietary/product/etc/permissions/lpa.xml
rename to sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml
index 4828ffa..04d0399 100644
--- a/sdm660-common/proprietary/product/etc/permissions/lpa.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml
@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.qti.lpa.uimlpalibrary"
-          file="/product/framework/uimlpalibrary.jar"/>
+          file="/system_ext/framework/uimlpalibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/moto-checkin.xml b/sdm660-common/proprietary/system_ext/etc/permissions/moto-checkin.xml
deleted file mode 100644
index 644ebc4..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/moto-checkin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="moto-checkin"
-        file="/system_ext/framework/moto-checkin.jar"
-        dependency="moto"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/moto-settings.xml b/sdm660-common/proprietary/system_ext/etc/permissions/moto-settings.xml
deleted file mode 100644
index bb76bcb..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/moto-settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="moto-settings"
-        file="/system_ext/framework/moto-settings.jar"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/moto.xml b/sdm660-common/proprietary/system_ext/etc/permissions/moto.xml
deleted file mode 100644
index 7012cce..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/moto.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="moto"
-        file="/system_ext/framework/moto.jar"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.dolby.daxservice.xml b/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.dolby.daxservice.xml
deleted file mode 100644
index eb5caea..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.dolby.daxservice.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.dolby.daxservice">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-    </privapp-permissions>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.android.providers.settings.xml b/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.android.providers.settings.xml
deleted file mode 100644
index fc2c857..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.android.providers.settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.motorola.android.providers.settings">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.dolby.dolbyui.xml b/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.dolby.dolbyui.xml
deleted file mode 100644
index 2fa191b..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.dolby.dolbyui.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.motorola.dolby.dolbyui">
-        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml b/sdm660-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml
index c3d64cb..e54d7e3 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml
@@ -46,8 +46,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
         <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.ims">
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml b/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml
new file mode 100644
index 0000000..6fe1cd2
--- /dev/null
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2014 Qualcomm Technologies, Inc.  All Rights Reserved.
+Qualcomm Technologies Proprietary and Confidential.
+-->
+
+<permissions>
+<library name="com.qualcomm.qti.QtiTelephonyServicelibrary"
+         file="/system/system_ext/framework/QtiTelephonyServicelibrary.jar"/>
+</permissions>
diff --git a/sdm660-common/proprietary/product/etc/permissions/uimremoteclient.xml b/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml
similarity index 79%
rename from sdm660-common/proprietary/product/etc/permissions/uimremoteclient.xml
rename to sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml
index 0f8c002..acc03be 100644
--- a/sdm660-common/proprietary/product/etc/permissions/uimremoteclient.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml
@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.uimremoteclientlibrary"
-          file="/product/framework/uimremoteclientlibrary.jar"/>
+          file="/system_ext/framework/uimremoteclientlibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/product/etc/permissions/uimremoteserver.xml b/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml
similarity index 79%
rename from sdm660-common/proprietary/product/etc/permissions/uimremoteserver.xml
rename to sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml
index 90017c2..0626f80 100644
--- a/sdm660-common/proprietary/product/etc/permissions/uimremoteserver.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml
@@ -8,5 +8,5 @@
 
 <permissions>
  <library name="com.qualcomm.uimremoteserverlibrary"
-          file="/product/framework/uimremoteserverlibrary.jar"/>
+          file="/system_ext/framework/uimremoteserverlibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml b/sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
deleted file mode 100644
index c34efed..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-/*********************************************************************
- Copyright (c) 2021-2022 Qualcomm Technologies, Inc.
- All Rights Reserved.
- Confidential and Proprietary - Qualcomm Technologies, Inc.
-**********************************************************************/
--->
-<permissions>
-    <library name="vendor.qti.ims.factory-V2.0-java"
-        file="/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar"/>
-    <library name="vendor.qti.ims.connection-V1.0-java"
-        file="/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar"/>
-    <library name="vendor.qti.ims.rcsuce-V1.0-java"
-        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar"/>
-    <library name="vendor.qti.ims.rcssip-V1.0-java"
-        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar"/>
-    <library name="vendor.qti.ims.factory-V2.1-java"
-        file="/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar"/>
-    <library name="vendor.qti.ims.rcsuce-V1.1-java"
-        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar"/>
-    <library name="vendor.qti.ims.rcssip-V1.1-java"
-        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar"/>
-    <library name="vendor.qti.ims.factory-V2.2-java"
-        file="/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar"/>
-    <library name="vendor.qti.ims.rcsuce-V1.2-java"
-        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"/>
-    <library name="vendor.qti.ims.rcssip-V1.2-java"
-        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar"/>
-</permissions>
\ No newline at end of file
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.imsdcservice.xml b/sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.imsdcservice.xml
deleted file mode 100644
index e17d379..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.imsdcservice.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-/*********************************************************************
- Copyright (c) 2022 Qualcomm Technologies, Inc.
- All Rights Reserved.
- Confidential and Proprietary - Qualcomm Technologies, Inc.
-**********************************************************************/
--->
-<permissions>
-<library name="vendor.qti.ims.datachannelservice-V1-java"
-         file="/system_ext/framework/vendor.qti.ims.datachannelservice-V1-java.jar"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.dolby.daxservice.xml b/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.dolby.daxservice.xml
deleted file mode 100644
index eb793ea..0000000
--- a/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.dolby.daxservice.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.dolby.daxservice"/>
-    <allow-in-power-save package="com.dolby.daxservice" />
-</config>
diff --git a/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.android.providers.settings.xml b/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.android.providers.settings.xml
deleted file mode 100644
index 599d386..0000000
--- a/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.android.providers.settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.motorola.android.providers.settings"/>
-    <allow-in-power-save package="com.motorola.android.providers.settings" />
-</config>
diff --git a/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.dolby.dolbyui.xml b/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.dolby.dolbyui.xml
deleted file mode 100644
index d4e5ac7..0000000
--- a/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.dolby.dolbyui.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.motorola.dolby.dolbyui"/>
-    <allow-in-power-save package="com.motorola.dolby.dolbyui" />
-</config>
diff --git a/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.motosignature.app.xml b/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.motosignature.app.xml
deleted file mode 100644
index 341728d..0000000
--- a/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.motosignature.app.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.motorola.motosignature.app"/>
-    <allow-in-power-save package="com.motorola.motosignature.app" />
-</config>
diff --git a/sdm660-common/proprietary/system_ext/framework/ActivityExt.jar b/sdm660-common/proprietary/system_ext/framework/ActivityExt.jar
index 533e760..974b9be 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/ActivityExt.jar and b/sdm660-common/proprietary/system_ext/framework/ActivityExt.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/audiosphere.jar b/sdm660-common/proprietary/system_ext/framework/audiosphere.jar
index f18032d..e2968e5 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/audiosphere.jar and b/sdm660-common/proprietary/system_ext/framework/audiosphere.jar differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar b/sdm660-common/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar
deleted file mode 100644
index 0bca04f..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.motorola.frameworks.core.addon.jar b/sdm660-common/proprietary/system_ext/framework/com.motorola.frameworks.core.addon.jar
deleted file mode 100644
index c70f652..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/com.motorola.frameworks.core.addon.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/com.motorola.motosignature.jar b/sdm660-common/proprietary/system_ext/framework/com.motorola.motosignature.jar
deleted file mode 100644
index cc681e3..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/com.motorola.motosignature.jar and /dev/null 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 a289bde..cac9b04 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 ac4cd71..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 673f3dc..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 6de6682..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 f8644aa..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 00538ce..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
index 4e0b7c9..debeaa4 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.2-java.jar 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
index 75490c8..6d27851 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.qualcomm.qti.uceservice-V2.3-java.jar 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
index da105da..ec0bb75 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/com.quicinc.cne.api-V1.0-java.jar 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 9dfa757..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 d120834..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 f265ab4..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 46859be..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/datachannellib.jar b/sdm660-common/proprietary/system_ext/framework/datachannellib.jar
deleted file mode 100644
index 4070396..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/datachannellib.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/dpmapi.jar b/sdm660-common/proprietary/system_ext/framework/dpmapi.jar
index 4fa7eae..d352ee3 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/moto-checkin.jar b/sdm660-common/proprietary/system_ext/framework/moto-checkin.jar
deleted file mode 100644
index 466551f..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/moto-checkin.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/moto-settings.jar b/sdm660-common/proprietary/system_ext/framework/moto-settings.jar
deleted file mode 100644
index de244b4..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/moto-settings.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/moto.jar b/sdm660-common/proprietary/system_ext/framework/moto.jar
deleted file mode 100644
index fdf058d..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/moto.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/qcrilhook.jar b/sdm660-common/proprietary/system_ext/framework/qcrilhook.jar
old mode 100644
new mode 100755
index e79a01c..d8719a0
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
old mode 100644
new mode 100755
index 04f7d3c..9da16a0
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..ba90f6b
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..843b1b6
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
index 13c3c17..2844a33 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V1.0-java.jar 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
index b70d9a4..50ca843 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.0-java.jar 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
index a3ed9a9..ad56773 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.1-java.jar 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
index ec6ecd8..adc42a9 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.2-java.jar 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
index ca113b0..e687672 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.3-java.jar 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.factory-V2.4-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.4-java.jar
deleted file mode 100644
index f6cb5fd..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.4-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.5-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.5-java.jar
deleted file mode 100644
index 112fc96..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.factory-V2.5-java.jar and /dev/null 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
index f4cec0d..3a9c5bb 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.mwqem-V1.0-java.jar 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
index 43fe6c3..233bd63 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.data.slm-V1.0-java.jar 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 3f2789f..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 b8bb5af..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
index c3763df..0c94603 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.0-java.jar 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.cne.internal.server-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.1-java.jar
deleted file mode 100644
index bc521f7..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.1-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.2-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.2-java.jar
deleted file mode 100644
index d8e41cc..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.2-java.jar and /dev/null 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 8751943..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 be23a32..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 c44408c..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.dynamicdds-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.1-java.jar
deleted file mode 100644
index ba98ebc..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.1-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.0-java.jar
deleted file mode 100644
index 92b60b8..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.0-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.1-java.jar
deleted file mode 100644
index 5580076..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.1-java.jar and /dev/null 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 4cb2232..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.iwlan-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.1-java.jar
deleted file mode 100644
index 4405e6d..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.1-java.jar and /dev/null 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
index e6deca1..7a118cb 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.latency-V1.0-java.jar 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
index 62c287c..27424ff 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.data.lce-V1.0-java.jar 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 f2c10c0..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
index 422ed78..2ab4010 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.mwqemadapter-V1.0-java.jar 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
index 51062e4..70bb0bc 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.hardware.slmadapter-V1.0-java.jar 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 caa4516..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 eb3097b..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.configservice-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.0-java.jar
deleted file mode 100644
index c58a412..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.0-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar
deleted file mode 100644
index 33cfee8..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar
deleted file mode 100644
index ec82e48..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.datachannelservice-V1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.datachannelservice-V1-java.jar
deleted file mode 100644
index c82e9ad..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.datachannelservice-V1-java.jar and /dev/null 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
index c7aa96e..97e58f9 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.0-java.jar 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
index 5cce99a..e392082 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar 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.factory-V2.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar
deleted file mode 100644
index 7dca503..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar
deleted file mode 100644
index d244877..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar
deleted file mode 100644
index bb7a518..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar and /dev/null 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 9371dd0..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
index 8e6730a..7debc6e 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar 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
index 5aad837..840c8d5 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.0-java.jar 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
index 32f2347..65cbb88 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.1-java.jar 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.ims.rcssip-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar
deleted file mode 100644
index bef571f..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar
deleted file mode 100644
index c84ae1c..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar
deleted file mode 100644
index 7317d8a..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar
deleted file mode 100644
index 24ec8c9..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar
deleted file mode 100644
index 5ccf637..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar
deleted file mode 100644
index 8717b55..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar and /dev/null 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
index 6c5138c..43fd83f 100644
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.0-java.jar 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
deleted file mode 100644
index 21446e0..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.2-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.2-java.jar
deleted file mode 100644
index f6f39cf..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.2-java.jar and /dev/null 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
old mode 100644
new mode 100755
index 0cfbc28..b686a75
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
old mode 100644
new mode 100755
index 782132f..fced342
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
old mode 100644
new mode 100755
index b3f23e6..5e7cc57
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
old mode 100644
new mode 100755
index fcd7ef5..dca08cf
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
old mode 100644
new mode 100755
index 89ea504..d301746
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
old mode 100644
new mode 100755
index 2f3d85f..cd02a21
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
old mode 100644
new mode 100755
index afc57c6..050618a
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
old mode 100644
new mode 100755
index 09ab95a..4b26a81
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
old mode 100644
new mode 100755
index 65f6aad..f3d4652
Binary files a/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so 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
old mode 100644
new mode 100755
index 896c4e6..ee89009
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
old mode 100644
new mode 100755
index 57b67b0..22ff4e7
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
old mode 100644
new mode 100755
index f0659d9..f6f4f64
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
old mode 100644
new mode 100755
index 2523a84..1b10bf8
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
old mode 100644
new mode 100755
index 654714c..c6a5168
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/lib-imsvideocodec.so b/sdm660-common/proprietary/system_ext/lib64/lib-imsvideocodec.so
index 76ebf45..d741e93 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 2bb4fab..0996d36 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 2cfcee0..abd1e50 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 a9d44ec..c4cbad0 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/libdiag_system.so b/sdm660-common/proprietary/system_ext/lib64/libdiag_system.so
old mode 100644
new mode 100755
index 9cc432d..91954af
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 fa6e367..ae96795 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 75f4774..2131da5 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 ed87998..a2dc751 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 0e22d55..5b838e6 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
index 48f0647..246e973 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libembmsmmosal.so 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
index 6729965..8b1f908 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libembmsmmparser_lite.so 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
index 24d4cd8..25f0b7a 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libembmssqlite.so 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
index 04d7f87..5c2ef69 100644
Binary files a/sdm660-common/proprietary/system_ext/lib64/libembmstinyxml.so and b/sdm660-common/proprietary/system_ext/lib64/libembmstinyxml.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 885548d..1faac5b 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 0b08dec..50200ab 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/libmwqemiptablemgr.so b/sdm660-common/proprietary/system_ext/lib64/libmwqemiptablemgr.so
old mode 100644
new mode 100755
index 401e2e1..d44a58f
Binary files a/sdm660-common/proprietary/system_ext/lib64/libmwqemiptablemgr.so 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
old mode 100644
new mode 100755
index faa0311..a1d954d
Binary files a/sdm660-common/proprietary/system_ext/lib64/libqmi_cci_system.so 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
old mode 100644
new mode 100755
index 1dc423b..9759c77
Binary files a/sdm660-common/proprietary/system_ext/lib64/libqmi_encdec_system.so and b/sdm660-common/proprietary/system_ext/lib64/libqmi_encdec_system.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
old mode 100644
new mode 100755
index cfb3417..ff576fa
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@1.0.so 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
old mode 100644
new mode 100755
index c755d5b..ab06794
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.0.so 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
old mode 100644
new mode 100755
index b1bfdfb..4810820
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.1.so 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
old mode 100644
new mode 100755
index c30ca83..30efb81
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.2.so 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
old mode 100644
new mode 100755
index d68abe5..d22d3d4
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.3.so 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.factory@2.4.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.4.so
deleted file mode 100644
index 2251fe5..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.4.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.5.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.5.so
deleted file mode 100644
index b34bf20..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.5.so and /dev/null 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
old mode 100644
new mode 100755
index 4def344..4c81291
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.mwqem@1.0.so 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
old mode 100644
new mode 100755
index 8c918ed..2ca259a
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.slm@1.0.so 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
old mode 100644
new mode 100755
index de718c2..61ab42a
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
old mode 100644
new mode 100755
index e87752a..2c5c075
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
old mode 100644
new mode 100755
index 965f677..8f41ee6
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
old mode 100644
new mode 100755
index 47c1d51..675dcbc
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.cne.internal.server@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.1.so
deleted file mode 100644
index ceb6f4c..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.2.so
deleted file mode 100644
index 8efc22d..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.2.so and /dev/null 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
old mode 100644
new mode 100755
index b8a7319..f49af1e
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
old mode 100644
new mode 100755
index b308452..3b3dc48
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
old mode 100644
new mode 100755
index 9ba4bf3..0c1a40a
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.dynamicdds@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.dynamicdds@1.1.so
deleted file mode 100644
index f10aae2..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.dynamicdds@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.flow@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.flow@1.0.so
deleted file mode 100644
index 7ee0a25..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.flow@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.flow@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.flow@1.1.so
deleted file mode 100644
index 5538f36..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.flow@1.1.so and /dev/null 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
old mode 100644
new mode 100755
index 0a29af5..f7b1456
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.iwlan@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.iwlan@1.1.so
deleted file mode 100644
index 7698b7c..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.iwlan@1.1.so and /dev/null 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
old mode 100644
new mode 100755
index 9e84b9d..007965d
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.latency@1.0.so 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
old mode 100644
new mode 100755
index e114ce4..feb6740
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.lce@1.0.so 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
old mode 100644
new mode 100755
index 54c5ef4..269c373
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.mwqemadapter@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.mwqemadapter@1.0.so
old mode 100644
new mode 100755
index e5b2246..1875890
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.mwqemadapter@1.0.so 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.qseecom@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.qseecom@1.0.so
deleted file mode 100644
index 782b77a..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.qseecom@1.0.so and /dev/null 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
old mode 100644
new mode 100755
index 8ac1c72..7ba885c
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.am@1.0.so 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
old mode 100644
new mode 100755
index 265171f..56c899c
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so 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
old mode 100644
new mode 100755
index cf7b947..41b4fdf
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so 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
old mode 100644
new mode 100755
index 36b3091..2321d99
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so 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
old mode 100644
new mode 100755
index e2d0b12..4d20ff0
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so 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
old mode 100644
new mode 100755
index ffa453e..0882242
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so 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
old mode 100644
new mode 100755
index c75c090..c2da69c
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.5.so 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
old mode 100644
new mode 100755
index 27f3876..1d77f5d
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.6.so 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
deleted file mode 100644
index e2873d1..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.8.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.8.so
deleted file mode 100644
index d42d2bd..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.8.so and /dev/null 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
old mode 100644
new mode 100755
index b322ed8..077c4f3
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so 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
old mode 100644
new mode 100755
index 451014d..04024fd
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.0.so 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.qcrilhook@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so
old mode 100644
new mode 100755
index 5aaaff9..1ff6d24
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so 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
old mode 100644
new mode 100755
index f55aef9..81d59ee
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so 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
old mode 100644
new mode 100755
index 9caf4ee..44d80d9
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so 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
old mode 100644
new mode 100755
index 9b3948b..4aa0ed3
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.1.so 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
old mode 100644
new mode 100755
index ba42192..4bf0aa4
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so 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
old mode 100644
new mode 100755
index bef42a3..6b9b17e
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so 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
old mode 100644
new mode 100755
index 0a6bc4f..cfda8d5
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so 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.uim@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.0.so
old mode 100644
new mode 100755
index cba37cf..deac4f1
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.0.so 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
old mode 100644
new mode 100755
index 82dfa7f..748d8af
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.1.so 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
old mode 100644
new mode 100755
index 6aeaa03..a3ce14b
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.2.so 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
old mode 100644
new mode 100755
index da99281..e9efcbe
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.0.so 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
old mode 100644
new mode 100755
index d42cbfb..4c0e961
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.1.so 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
old mode 100644
new mode 100755
index 6c91235..3cf4ece
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_client@1.2.so 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
old mode 100644
new mode 100755
index 59e4af1..973064b
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim_remote_server@1.0.so 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
old mode 100644
new mode 100755
index ec209f1..ccd1abf
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.slmadapter@1.0.so 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.hardware.tui_comm@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.tui_comm@1.0.so
deleted file mode 100644
index b5ea1b2..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.tui_comm@1.0.so and /dev/null 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
old mode 100644
new mode 100755
index b94860f..fd4b8cb
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
old mode 100644
new mode 100755
index 564a235..deb3f15
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.configservice@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.configservice@1.0.so
deleted file mode 100644
index 2d2afad..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.configservice@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.configservice@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.configservice@1.1.so
deleted file mode 100644
index 3928622..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.configservice@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.connection@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.connection@1.0.so
deleted file mode 100644
index 874e1ce..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.connection@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.datachannelservice-V1-ndk.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.datachannelservice-V1-ndk.so
deleted file mode 100644
index 98baeb6..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.datachannelservice-V1-ndk.so and /dev/null 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
old mode 100644
new mode 100755
index 3bddc5c..a8e2cb1
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
old mode 100644
new mode 100755
index d0cded9..bd5050d
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.1.so 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.factory@2.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.0.so
deleted file mode 100644
index 0d3c1bc..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.1.so
deleted file mode 100644
index bd603f0..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.2.so
deleted file mode 100644
index 75a4112..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.2.so and /dev/null 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
old mode 100644
new mode 100755
index e09bea7..fe48440
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
old mode 100644
new mode 100755
index a10a382..21fd6ae
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.1.so 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
old mode 100644
new mode 100755
index 15ba880..cb9a571
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.0.so 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
old mode 100644
new mode 100755
index bbb7ef8..7d86189
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.1.so 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.ims.rcssip@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.0.so
deleted file mode 100644
index 9660cb3..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.1.so
deleted file mode 100644
index 3d8200d..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.2.so
deleted file mode 100644
index 916501f..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.2.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.0.so
deleted file mode 100644
index d727ea8..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.1.so
deleted file mode 100644
index dfd6cea..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.2.so
deleted file mode 100644
index 6cf2b88..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.2.so and /dev/null 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
old mode 100644
new mode 100755
index 635510b..3ea3f68
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.imsrtpservice@3.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so
deleted file mode 100644
index 31209ea..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so and /dev/null 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
old mode 100644
new mode 100755
index d1e2cf1..9ba22c3
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.0.so 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
deleted file mode 100644
index c2cc361..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.2.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.2.so
deleted file mode 100644
index 1f9aa31..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.2.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/priv-app/MotoDolbyDax3/MotoDolbyDax3.apk b/sdm660-common/proprietary/system_ext/priv-app/MotoDolbyDax3/MotoDolbyDax3.apk
deleted file mode 100644
index 82bdd37..0000000
Binary files a/sdm660-common/proprietary/system_ext/priv-app/MotoDolbyDax3/MotoDolbyDax3.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk b/sdm660-common/proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk
deleted file mode 100644
index ef2ad64..0000000
Binary files a/sdm660-common/proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/priv-app/daxService/daxService.apk b/sdm660-common/proprietary/system_ext/priv-app/daxService/daxService.apk
deleted file mode 100644
index 869bd96..0000000
Binary files a/sdm660-common/proprietary/system_ext/priv-app/daxService/daxService.apk and /dev/null 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 bac5ffc..9285cfa 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
old mode 100644
new mode 100755
index fbe394f..dc42662
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
old mode 100644
new mode 100755
index c78e9df..5f7e942
Binary files a/sdm660-common/proprietary/vendor/app/CACertService/CACertService.apk 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
old mode 100644
new mode 100755
index 372eebe..11ceade
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
old mode 100644
new mode 100755
index 9b65fab..734375f
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/TimeService/TimeService.apk b/sdm660-common/proprietary/vendor/app/TimeService/TimeService.apk
old mode 100644
new mode 100755
index 26fdc3f..da46dd9
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/adpl b/sdm660-common/proprietary/vendor/bin/adpl
old mode 100644
new mode 100755
index b12ed28..73b1318
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/adsprpcd b/sdm660-common/proprietary/vendor/bin/adsprpcd
old mode 100644
new mode 100755
index 5d7bee8..e8c4883
Binary files a/sdm660-common/proprietary/vendor/bin/adsprpcd and b/sdm660-common/proprietary/vendor/bin/adsprpcd differ
diff --git a/sdm660-common/proprietary/vendor/bin/cnd b/sdm660-common/proprietary/vendor/bin/cnd
old mode 100644
new mode 100755
index c4a74d6..b29306d
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/cnss-daemon b/sdm660-common/proprietary/vendor/bin/cnss-daemon
old mode 100644
new mode 100755
index 894f36b..432f1fb
Binary files a/sdm660-common/proprietary/vendor/bin/cnss-daemon and b/sdm660-common/proprietary/vendor/bin/cnss-daemon differ
diff --git a/sdm660-common/proprietary/vendor/bin/dspservice b/sdm660-common/proprietary/vendor/bin/dspservice
old mode 100644
new mode 100755
index b68bf5f..d57d619
Binary files a/sdm660-common/proprietary/vendor/bin/dspservice and b/sdm660-common/proprietary/vendor/bin/dspservice differ
diff --git a/sdm660-common/proprietary/vendor/bin/garden_app b/sdm660-common/proprietary/vendor/bin/garden_app
old mode 100644
new mode 100755
index 514fc2a..3e5092b
Binary files a/sdm660-common/proprietary/vendor/bin/garden_app and b/sdm660-common/proprietary/vendor/bin/garden_app differ
diff --git a/sdm660-common/proprietary/vendor/bin/hvdcp_opti b/sdm660-common/proprietary/vendor/bin/hvdcp_opti
old mode 100644
new mode 100755
index 0f67cf4..a97b1bd
Binary files a/sdm660-common/proprietary/vendor/bin/hvdcp_opti and b/sdm660-common/proprietary/vendor/bin/hvdcp_opti differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti b/sdm660-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
index f9d0946..bdc9a62 100644
Binary files a/sdm660-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti and b/sdm660-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/android.hardware.keymaster@3.0-service-qti b/sdm660-common/proprietary/vendor/bin/hw/android.hardware.keymaster@3.0-service-qti
index 4858c56..3741726 100644
Binary files a/sdm660-common/proprietary/vendor/bin/hw/android.hardware.keymaster@3.0-service-qti and b/sdm660-common/proprietary/vendor/bin/hw/android.hardware.keymaster@3.0-service-qti differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/qcrild b/sdm660-common/proprietary/vendor/bin/hw/qcrild
old mode 100644
new mode 100755
index 089ccfe..8b20d14
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.dolby.hardware.dms@2.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service
deleted file mode 100644
index cb6f542..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service and /dev/null 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
old mode 100644
new mode 100755
index 1cb6140..ba43958
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.perf@2.2-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
new file mode 100755
index 0000000..51ec9fd
Binary files /dev/null and b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-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
old mode 100644
new mode 100755
index 2952a83..3209ffd
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service 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
old mode 100644
new mode 100755
index 4be165d..c3f3181
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.tui_comm@1.0-service-qti b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti
old mode 100644
new mode 100755
index 06b382f..c0c7555
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
old mode 100644
new mode 100755
index 6ad70ec..a2ac690
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
old mode 100644
new mode 100755
index 33633d6..d77a300
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
old mode 100644
new mode 100755
index afd2cab..1cae2c1
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
old mode 100644
new mode 100755
index 0944183..c2cb55d
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/irsc_util b/sdm660-common/proprietary/vendor/bin/irsc_util
old mode 100644
new mode 100755
index 1aae48a..76d28ba
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/loc_launcher b/sdm660-common/proprietary/vendor/bin/loc_launcher
old mode 100644
new mode 100755
index d1f09bc..d2a613f
Binary files a/sdm660-common/proprietary/vendor/bin/loc_launcher and b/sdm660-common/proprietary/vendor/bin/loc_launcher differ
diff --git a/sdm660-common/proprietary/vendor/bin/lowi-server b/sdm660-common/proprietary/vendor/bin/lowi-server
old mode 100644
new mode 100755
index e596e46..ad381e7
Binary files a/sdm660-common/proprietary/vendor/bin/lowi-server and b/sdm660-common/proprietary/vendor/bin/lowi-server differ
diff --git a/sdm660-common/proprietary/vendor/bin/mlid b/sdm660-common/proprietary/vendor/bin/mlid
old mode 100644
new mode 100755
index e208312..9d5e294
Binary files a/sdm660-common/proprietary/vendor/bin/mlid and b/sdm660-common/proprietary/vendor/bin/mlid differ
diff --git a/sdm660-common/proprietary/vendor/bin/msm_irqbalance b/sdm660-common/proprietary/vendor/bin/msm_irqbalance
index 1501779..595a99c 100644
Binary files a/sdm660-common/proprietary/vendor/bin/msm_irqbalance and b/sdm660-common/proprietary/vendor/bin/msm_irqbalance differ
diff --git a/sdm660-common/proprietary/vendor/bin/netmgrd b/sdm660-common/proprietary/vendor/bin/netmgrd
old mode 100644
new mode 100755
index 638d4b3..e122aaf
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
old mode 100644
new mode 100755
index d661ca2..d30d41d
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/pm-proxy b/sdm660-common/proprietary/vendor/bin/pm-proxy
old mode 100644
new mode 100755
index ab84bed..e4de55b
Binary files a/sdm660-common/proprietary/vendor/bin/pm-proxy and b/sdm660-common/proprietary/vendor/bin/pm-proxy differ
diff --git a/sdm660-common/proprietary/vendor/bin/pm-service b/sdm660-common/proprietary/vendor/bin/pm-service
old mode 100644
new mode 100755
index 76a9a57..ec1cc40
Binary files a/sdm660-common/proprietary/vendor/bin/pm-service and b/sdm660-common/proprietary/vendor/bin/pm-service differ
diff --git a/sdm660-common/proprietary/vendor/bin/port-bridge b/sdm660-common/proprietary/vendor/bin/port-bridge
old mode 100644
new mode 100755
index de6841c..2bf4589
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
old mode 100644
new mode 100755
index 274c848..b1e3c70
Binary files a/sdm660-common/proprietary/vendor/bin/power_off_alarm and b/sdm660-common/proprietary/vendor/bin/power_off_alarm differ
diff --git a/sdm660-common/proprietary/vendor/bin/qrtr-cfg b/sdm660-common/proprietary/vendor/bin/qrtr-cfg
old mode 100644
new mode 100755
index 91b5028..f7fbfa6
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-ns b/sdm660-common/proprietary/vendor/bin/qrtr-ns
old mode 100644
new mode 100755
index 17c134b..b31f772
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
old mode 100644
new mode 100755
index 15da819..e73d9b0
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
old mode 100644
new mode 100755
index 7e26c9a..9c4bb21
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
old mode 100644
new mode 100755
index e19254a..c32522f
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/sensors.qti b/sdm660-common/proprietary/vendor/bin/sensors.qti
old mode 100644
new mode 100755
index a430d41..73ceee6
Binary files a/sdm660-common/proprietary/vendor/bin/sensors.qti and b/sdm660-common/proprietary/vendor/bin/sensors.qti differ
diff --git a/sdm660-common/proprietary/vendor/bin/slim_daemon b/sdm660-common/proprietary/vendor/bin/slim_daemon
old mode 100644
new mode 100755
index fce4e3d..630575a
Binary files a/sdm660-common/proprietary/vendor/bin/slim_daemon and b/sdm660-common/proprietary/vendor/bin/slim_daemon differ
diff --git a/sdm660-common/proprietary/vendor/bin/ssgqmigd b/sdm660-common/proprietary/vendor/bin/ssgqmigd
old mode 100644
new mode 100755
index 73ff2e3..3730b9f
Binary files a/sdm660-common/proprietary/vendor/bin/ssgqmigd and b/sdm660-common/proprietary/vendor/bin/ssgqmigd differ
diff --git a/sdm660-common/proprietary/vendor/bin/ssr_diag b/sdm660-common/proprietary/vendor/bin/ssr_diag
old mode 100644
new mode 100755
index 94cb5e8..d5b717f
Binary files a/sdm660-common/proprietary/vendor/bin/ssr_diag and b/sdm660-common/proprietary/vendor/bin/ssr_diag differ
diff --git a/sdm660-common/proprietary/vendor/bin/ssr_setup b/sdm660-common/proprietary/vendor/bin/ssr_setup
old mode 100644
new mode 100755
index 9ef8c91..a5d4421
Binary files a/sdm660-common/proprietary/vendor/bin/ssr_setup and b/sdm660-common/proprietary/vendor/bin/ssr_setup differ
diff --git a/sdm660-common/proprietary/vendor/bin/subsystem_ramdump b/sdm660-common/proprietary/vendor/bin/subsystem_ramdump
old mode 100644
new mode 100755
index 27a9f8c..8f526c2
Binary files a/sdm660-common/proprietary/vendor/bin/subsystem_ramdump and b/sdm660-common/proprietary/vendor/bin/subsystem_ramdump differ
diff --git a/sdm660-common/proprietary/vendor/bin/tftp_server b/sdm660-common/proprietary/vendor/bin/tftp_server
old mode 100644
new mode 100755
index ceb479f..426cde2
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/thermal-engine b/sdm660-common/proprietary/vendor/bin/thermal-engine
old mode 100644
new mode 100755
index a4353e7..3597b2f
Binary files a/sdm660-common/proprietary/vendor/bin/thermal-engine and b/sdm660-common/proprietary/vendor/bin/thermal-engine differ
diff --git a/sdm660-common/proprietary/vendor/bin/time_daemon b/sdm660-common/proprietary/vendor/bin/time_daemon
old mode 100644
new mode 100755
index b6a9bf5..bc7cf0c
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/xtra-daemon b/sdm660-common/proprietary/vendor/bin/xtra-daemon
old mode 100644
new mode 100755
index 606121b..9e4760c
Binary files a/sdm660-common/proprietary/vendor/bin/xtra-daemon and b/sdm660-common/proprietary/vendor/bin/xtra-daemon differ
diff --git a/sdm660-common/proprietary/vendor/bin/xtwifi-client b/sdm660-common/proprietary/vendor/bin/xtwifi-client
old mode 100644
new mode 100755
index a4c592f..2f88034
Binary files a/sdm660-common/proprietary/vendor/bin/xtwifi-client and b/sdm660-common/proprietary/vendor/bin/xtwifi-client differ
diff --git a/sdm660-common/proprietary/vendor/bin/xtwifi-inet-agent b/sdm660-common/proprietary/vendor/bin/xtwifi-inet-agent
old mode 100644
new mode 100755
index 3e8fc89..6009922
Binary files a/sdm660-common/proprietary/vendor/bin/xtwifi-inet-agent and b/sdm660-common/proprietary/vendor/bin/xtwifi-inet-agent differ
diff --git a/sdm660-common/proprietary/vendor/etc/data/dsi_config.xml b/sdm660-common/proprietary/vendor/etc/data/dsi_config.xml
index 14d9028..5609382 100644
--- a/sdm660-common/proprietary/vendor/etc/data/dsi_config.xml
+++ b/sdm660-common/proprietary/vendor/etc/data/dsi_config.xml
@@ -1259,8 +1259,8 @@
      </list>
    </listitem>
 
-   <!-- Configuration for lahaina_pt -->
-   <listitem name="lahaina_pt">
+   <!-- Configuration for monaco-->
+   <listitem name="monaco">
 
      <data name="qos_enabled" type="int"> 1 </data>
      <data name="rmnet_data_enabled" type="int"> 1 </data>
@@ -1311,86 +1311,5 @@
        <data type="string"> rmnet_data16 </data>
      </list>
    </listitem>
-
-   <!-- Configuration for monaco-->
-   <listitem name="monaco">
-
-     <data name="qos_enabled" type="int"> 1 </data>
-     <data name="rmnet_data_enabled" type="int"> 1 </data>
-     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
-
-     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
-     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
-
-     <data name="num_dsi_handles" type="int"> 11 </data>
-     <list name="device_names">
-       <data type="string"> rmnet_data0 </data>
-       <data type="string"> rmnet_data1 </data>
-       <data type="string"> rmnet_data2 </data>
-       <data type="string"> rmnet_data3 </data>
-       <data type="string"> rmnet_data4 </data>
-       <data type="string"> rmnet_data5 </data>
-       <data type="string"> rmnet_data6 </data>
-       <data type="string"> rmnet_data7 </data>
-       <data type="string"> rmnet_data8 </data>
-       <data type="string"> rmnet_data9 </data>
-       <data type="string"> rmnet_data10 </data>
-     </list>
-
-     <list name="control_port_names">
-       <data type="string"> rmnet_data0 </data>
-       <data type="string"> rmnet_data1 </data>
-       <data type="string"> rmnet_data2 </data>
-       <data type="string"> rmnet_data3 </data>
-       <data type="string"> rmnet_data4 </data>
-       <data type="string"> rmnet_data5 </data>
-       <data type="string"> rmnet_data6 </data>
-       <data type="string"> rmnet_data7 </data>
-       <data type="string"> rmnet_data8 </data>
-       <data type="string"> rmnet_data9 </data>
-       <data type="string"> rmnet_data10 </data>
-     </list>
-   </listitem>
-
-   <!-- Configuration for QTang  -->
-   <listitem name="qtang">
-
-     <data name="qos_enabled" type="int"> 1 </data>
-     <data name="rmnet_data_enabled" type="int"> 1 </data>
-     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
-
-     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
-     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
-
-     <data name="num_dsi_handles" type="int"> 11 </data>
-     <list name="device_names">
-       <data type="string"> rmnet_data0 </data>
-       <data type="string"> rmnet_data1 </data>
-       <data type="string"> rmnet_data2 </data>
-       <data type="string"> rmnet_data3 </data>
-       <data type="string"> rmnet_data4 </data>
-       <data type="string"> rmnet_data5 </data>
-       <data type="string"> rmnet_data6 </data>
-       <data type="string"> rmnet_data7 </data>
-       <data type="string"> rmnet_data8 </data>
-       <data type="string"> rmnet_data9 </data>
-       <data type="string"> rmnet_data10 </data>
-     </list>
-     <list name="control_port_names">
-       <data type="string"> rmnet_data0 </data>
-       <data type="string"> rmnet_data1 </data>
-       <data type="string"> rmnet_data2 </data>
-       <data type="string"> rmnet_data3 </data>
-       <data type="string"> rmnet_data4 </data>
-       <data type="string"> rmnet_data5 </data>
-       <data type="string"> rmnet_data6 </data>
-       <data type="string"> rmnet_data7 </data>
-       <data type="string"> rmnet_data8 </data>
-       <data type="string"> rmnet_data9 </data>
-       <data type="string"> rmnet_data10 </data>
-     </list>
-   </listitem>
 </list>
 
diff --git a/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml b/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml
old mode 100644
new mode 100755
index 3b82771..7a17a0d
--- a/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml
+++ b/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Netmgr Module configuration XML file
-     Copyright (c) 2013, 2016-2022 Qualcomm Technologies, Inc.
+     Copyright (c) 2013, 2016-2021 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -2803,7 +2803,6 @@
       <data name="kfc_mode" type="int"> 4 </data>
       <data name="kfc_qmap" type="int"> 1 </data>
       <data name="qmi_pc" type="int"> 1 </data>
-      <data name="dfc_ps_ext" type="int"> 0 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
 
       <data name="single_qmux_ch_enabled" type="int"> 1 </data>
@@ -3225,16 +3224,16 @@
       <data name="static_rev_links" type="int"> 4 </data>
    </listitem>
 
-   <!-- lahaina_pt parameters -->
-   <listitem name = "lahaina_pt">
+   <!-- monaco parameters -->
+   <listitem name = "monaco">
 
       <data name="qmi_dpm_enabled" type="int"> 1 </data>
       <data name="use_qmuxd" type="int"> 0 </data>
       <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 4 </data>
-      <data name="kfc_qmap" type="int"> 1 </data>
-      <data name="qmi_pc" type="int"> 1 </data>
+      <data name="kfc_mode" type="int"> 0 </data>
+      <data name="kfc_qmap" type="int"> 0 </data>
+      <data name="qmi_pc" type="int"> 0 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
       <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
 
@@ -3252,13 +3251,13 @@
       <data name="dataformat_ul_data_aggregation_protocol" type="int"> 9 </data>
       <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
       <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
-      <data name="rsc" type="int"> 2 </data>
-      <data name="rsb" type="int"> 2 </data>
+      <data name="rsc" type="int"> 0 </data>
+      <data name="rsb" type="int"> 0 </data>
       <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
       <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
-      <data name="rmnet_offload" type="int"> 1 </data>
-      <data name="rmnet_shs" type="int"> 1 </data>
-      <data name="uplink_priority" type="int"> 1 </data>
+      <data name="rmnet_offload" type="int"> 0 </data>
+      <data name="rmnet_shs" type="int"> 0 </data>
+      <data name="uplink_priority" type="int"> 0 </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>
@@ -3367,234 +3366,4 @@
       <!-- Number of above reverse data ports inited on bootup -->
       <data name="static_rev_links" type="int"> 4 </data>
    </listitem>
-
-   <!-- monaco parameters -->
-   <listitem name = "monaco">
-
-      <data name="qmi_dpm_enabled" type="int"> 1 </data>
-      <data name="use_qmuxd" type="int"> 0 </data>
-      <data name="dpm_retry_timeout" type="int"> 10000 </data>
-      <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 0 </data>
-      <data name="kfc_qmap" type="int"> 0 </data>
-      <data name="qmi_pc" type="int"> 0 </data>
-      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
-
-      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
-      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
-      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
-
-      <data name="tc_ul_baserate" type="int"> 155000000 </data>
-      <data name="dynamic_tc_ul_baserate" type="int"> 1 </data>
-      <data name="tc_ul_burst" type="int"> 25000 </data>
-
-      <data name="rmnet_data_enabled" type="int"> 1 </data>
-      <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
-      <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
-      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
-      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
-      <data name="dataformat_agg_ul_time" type="int"> 0 </data>
-      <data name="dataformat_agg_ul_features" type="int"> 0 </data>
-      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 8 </data>
-      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 8 </data>
-      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
-      <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
-      <data name="rsc" type="int"> 0 </data>
-      <data name="rsb" type="int"> 0 </data>
-      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-      <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
-      <data name="rmnet_offload" type="int"> 0 </data>
-      <data name="rmnet_shs" type="int"> 0 </data>
-      <data name="uplink_priority" type="int"> 0 </data>
-      <data name="iwlan_concurrency" type="int"> 1 </data>
-      <data name="nl_xfrm" type="int"> 1 </data>
-      <data name="netdev_max_backlog" type="int"> 10000 </data>
-      <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
-      <data name="debug_netdev_max_backlog" type="int"> 1500 </data>
-
-      <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
-      <data name="disable_hystart" type="int"> 1 </data>
-      <data name="initial_ssthresh" type="int"> 1400 </data>
-      <data name="dl_marker_enabled" type="int"> 0 </data>
-      <data name="pnd_rps_mask" type="int"> 2 </data>
-      <data name="vnd_rps_mask" type="int"> 12 </data>
-      <data name="qos_via_idl" type="int"> 1 </data>
-      <data name="max_mtu" type="int"> 9216 </data>
-      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
-      <data name="num_modems" type="int"> 2 </data>
-      <list name="modems_enabled">
-      <data type="int"> 1 </data> <!-- MODEM_MSM -->
-      <data type="int"> 0 </data> <!-- MODEM_MDM -->
-      </list>
-
-      <data name="control_ports_len" type="int"> 11 </data>
-      <list name="control_ports">
-        <data type="string"> rmnet_data0 </data>
-        <data type="string"> rmnet_data1 </data>
-        <data type="string"> rmnet_data2 </data>
-        <data type="string"> rmnet_data3 </data>
-        <data type="string"> rmnet_data4 </data>
-        <data type="string"> rmnet_data5 </data>
-        <data type="string"> rmnet_data6 </data>
-        <data type="string"> rmnet_data7 </data>
-        <data type="string"> rmnet_data8 </data>
-        <data type="string"> rmnet_data9 </data>
-        <data type="string"> rmnet_data10 </data>
-      </list>
-
-      <data name="data_ports_len" type="int"> 11 </data>
-      <list name="data_ports">
-        <data type="string"> rmnet_data0 </data>
-        <data type="string"> rmnet_data1 </data>
-        <data type="string"> rmnet_data2 </data>
-        <data type="string"> rmnet_data3 </data>
-        <data type="string"> rmnet_data4 </data>
-        <data type="string"> rmnet_data5 </data>
-        <data type="string"> rmnet_data6 </data>
-        <data type="string"> rmnet_data7 </data>
-        <data type="string"> rmnet_data8 </data>
-        <data type="string"> rmnet_data9 </data>
-        <data type="string"> rmnet_data10 </data>
-      </list>
-      <!-- Number of above data ports inited on bootup -->
-      <data name="static_fwd_links" type="int"> 6 </data>
-
-      <!-- iWLAN ports -->
-      <data name="iwlan_enable" type="int"> 1 </data>
-      <data name="rev_control_ports_len" type="int"> 9 </data>
-      <list name="rev_control_ports">
-        <data type="string"> r_rmnet_data0 </data>
-        <data type="string"> r_rmnet_data1 </data>
-        <data type="string"> r_rmnet_data2 </data>
-        <data type="string"> r_rmnet_data3 </data>
-        <data type="string"> r_rmnet_data4 </data>
-        <data type="string"> r_rmnet_data5 </data>
-        <data type="string"> r_rmnet_data6 </data>
-        <data type="string"> r_rmnet_data7 </data>
-        <data type="string"> r_rmnet_data8 </data>
-      </list>
-
-      <data name="rev_data_ports_len" type="int"> 9 </data>
-      <list name="rev_data_ports">
-        <data type="string"> r_rmnet_data0 </data>
-        <data type="string"> r_rmnet_data1 </data>
-        <data type="string"> r_rmnet_data2 </data>
-        <data type="string"> r_rmnet_data3 </data>
-        <data type="string"> r_rmnet_data4 </data>
-        <data type="string"> r_rmnet_data5 </data>
-        <data type="string"> r_rmnet_data6 </data>
-        <data type="string"> r_rmnet_data7 </data>
-        <data type="string"> r_rmnet_data8 </data>
-      </list>
-      <!-- Number of above reverse data ports inited on bootup -->
-      <data name="static_rev_links" type="int"> 4 </data>
-   </listitem>
-
-   <!-- QTang parameters -->
-   <listitem name = "qtang">
-
-      <data name="qmi_dpm_enabled" type="int"> 1 </data>
-      <data name="use_qmuxd" type="int"> 0 </data>
-      <data name="dpm_retry_timeout" type="int"> 10000 </data>
-      <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 4 </data>
-      <data name="qmi_pc" type="int"> 1 </data>
-      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
-
-      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
-      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
-      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
-
-      <data name="tc_ul_baserate" type="int"> 155000000 </data>
-      <data name="dynamic_tc_ul_baserate" type="int"> 1 </data>
-      <data name="tc_ul_burst" type="int"> 25000 </data>
-
-      <data name="rmnet_data_enabled" type="int"> 1 </data>
-      <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
-      <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
-      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
-      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
-      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 8 </data>
-      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 8 </data>
-      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
-      <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
-      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-      <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
-      <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
-      <data name="netdev_max_backlog" type="int"> 10000 </data>
-
-      <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
-      <data name="disable_hystart" type="int"> 1 </data>
-      <data name="initial_ssthresh" type="int"> 1400 </data>
-      <data name="pnd_rps_mask" type="int"> 2 </data>
-      <data name="vnd_rps_mask" type="int"> 12 </data>
-      <data name="netdev_budget" type="int"> 0 </data>
-      <data name="tcp_mtu_probing" type="int"> 2 </data>
-      <data name="qos_via_idl" type="int"> 1 </data>
-      <data name="skip_buffered_qos_modify" type="int"> 1 </data>
-
-      <data name="num_modems" type="int"> 2 </data>
-      <list name="modems_enabled">
-         <data type="int"> 1 </data> <!-- MODEM_MSM -->
-         <data type="int"> 0 </data> <!-- MODEM_MDM -->
-      </list>
-
-      <data name="control_ports_len" type="int"> 11 </data>
-      <list name="control_ports">
-         <data type="string"> rmnet_data0 </data>
-         <data type="string"> rmnet_data1 </data>
-         <data type="string"> rmnet_data2 </data>
-         <data type="string"> rmnet_data3 </data>
-         <data type="string"> rmnet_data4 </data>
-         <data type="string"> rmnet_data5 </data>
-         <data type="string"> rmnet_data6 </data>
-         <data type="string"> rmnet_data7 </data>
-         <data type="string"> rmnet_data8 </data>
-         <data type="string"> rmnet_data9 </data>
-         <data type="string"> rmnet_data10 </data>
-      </list>
-
-      <data name="data_ports_len" type="int"> 11 </data>
-      <list name="data_ports">
-         <data type="string"> rmnet_data0 </data>
-         <data type="string"> rmnet_data1 </data>
-         <data type="string"> rmnet_data2 </data>
-         <data type="string"> rmnet_data3 </data>
-         <data type="string"> rmnet_data4 </data>
-         <data type="string"> rmnet_data5 </data>
-         <data type="string"> rmnet_data6 </data>
-         <data type="string"> rmnet_data7 </data>
-         <data type="string"> rmnet_data8 </data>
-         <data type="string"> rmnet_data9 </data>
-         <data type="string"> rmnet_data10 </data>
-      </list>
-
-      <!-- iWLAN ports -->
-      <data name="iwlan_enable" type="int"> 1 </data>
-      <data name="rev_control_ports_len" type="int"> 9 </data>
-      <list name="rev_control_ports">
-         <data type="string"> r_rmnet_data0 </data>
-         <data type="string"> r_rmnet_data1 </data>
-         <data type="string"> r_rmnet_data2 </data>
-         <data type="string"> r_rmnet_data3 </data>
-         <data type="string"> r_rmnet_data4 </data>
-         <data type="string"> r_rmnet_data5 </data>
-         <data type="string"> r_rmnet_data6 </data>
-         <data type="string"> r_rmnet_data7 </data>
-         <data type="string"> r_rmnet_data8 </data>
-      </list>
-
-      <data name="rev_data_ports_len" type="int"> 9 </data>
-      <list name="rev_data_ports">
-        <data type="string"> r_rmnet_data0 </data>
-        <data type="string"> r_rmnet_data1 </data>
-        <data type="string"> r_rmnet_data2 </data>
-        <data type="string"> r_rmnet_data3 </data>
-        <data type="string"> r_rmnet_data4 </data>
-        <data type="string"> r_rmnet_data5 </data>
-        <data type="string"> r_rmnet_data6 </data>
-        <data type="string"> r_rmnet_data7 </data>
-        <data type="string"> r_rmnet_data8 </data>
-      </list>
-   </listitem>
 </list>
diff --git a/sdm660-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc b/sdm660-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
index 264ae99..9086730 100644
--- a/sdm660-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
@@ -1,5 +1,13 @@
 on property:init.svc.mediadrm=running
     mkdir /data/vendor/mediadrm 0770 media mediadrm
+    start vendor.move_data_sh
+
+service vendor.move_data_sh /system/bin/move_widevine_data.sh
+    class late_start
+    user media
+    group media mediadrm system
+    disabled
+    oneshot
 
 service vendor.drm-widevine-hal-1-3 /vendor/bin/hw/android.hardware.drm@1.3-service.widevine
     interface android.hardware.drm@1.0::ICryptoFactory widevine
diff --git a/sdm660-common/proprietary/vendor/etc/init/cnd.rc b/sdm660-common/proprietary/vendor/etc/init/cnd.rc
index e0057b4..c2faa9a 100644
--- a/sdm660-common/proprietary/vendor/etc/init/cnd.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/cnd.rc
@@ -1,4 +1,4 @@
-service vendor.cnd /vendor/bin/cnd
+service vendor.cnd /system/vendor/bin/cnd
     class main
     user system
     group system wifi inet radio wakelock net_admin
diff --git a/sdm660-common/proprietary/vendor/etc/init/dataadpl.rc b/sdm660-common/proprietary/vendor/etc/init/dataadpl.rc
index f25cd82..24152a1 100644
--- a/sdm660-common/proprietary/vendor/etc/init/dataadpl.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/dataadpl.rc
@@ -5,9 +5,9 @@
 # Create the directories used by DPM subsystem
 
 #start dataadpl service
-service vendor.dataadpl /vendor/bin/adpl
+service vendor.dataadpl /system/vendor/bin/adpl
     class main
     user radio
     socket adpl_cmd_uds_file dgram 660 radio radio
     group radio oem_2901 diag usb inet
-    disabled
+    disabled
\ No newline at end of file
diff --git a/sdm660-common/proprietary/vendor/etc/init/dataqti.rc b/sdm660-common/proprietary/vendor/etc/init/dataqti.rc
index b0509c4..4c682b6 100644
--- a/sdm660-common/proprietary/vendor/etc/init/dataqti.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/dataqti.rc
@@ -11,7 +11,7 @@ on post-fs-data
     chmod 0770 /data/vendor/dataqti
 
 #start dataqti service
-service vendor.dataqti /vendor/bin/qti
+service vendor.dataqti /system/vendor/bin/qti
     class main
     user radio
     socket qti_dpm_uds_file dgram 660 radio radio
diff --git a/sdm660-common/proprietary/vendor/etc/init/init_thermal-engine.rc b/sdm660-common/proprietary/vendor/etc/init/init_thermal-engine.rc
index 109a6b2..3cc069c 100644
--- a/sdm660-common/proprietary/vendor/etc/init/init_thermal-engine.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/init_thermal-engine.rc
@@ -15,7 +15,6 @@ service thermal-engine /vendor/bin/thermal-engine
 	socket thermal-recv-client stream 0660 system oem_2907
 	socket thermal-recv-passive-client stream 0660 system oem_2907
 	socket thermal-send-rule stream 0660 system oem_2907
-	disabled
 
 on property:sys.boot_completed=1
 	restart thermal-engine
diff --git a/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc b/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
index 208b504..755090a 100644
--- a/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
@@ -34,7 +34,7 @@ on post-fs-data
 on property:persist.vendor.data.mode=disabled
     stop vendor.netmgrd
 
-service vendor.netmgrd /vendor/bin/netmgrd
+service vendor.netmgrd /system/vendor/bin/netmgrd
     class main
 
 on property:ro.vendor.use_data_netmgrd=false
diff --git a/sdm660-common/proprietary/vendor/etc/init/port-bridge.rc b/sdm660-common/proprietary/vendor/etc/init/port-bridge.rc
index 7695a9f..a22e40a 100644
--- a/sdm660-common/proprietary/vendor/etc/init/port-bridge.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/port-bridge.rc
@@ -13,7 +13,7 @@ on post-fs-data
     mkdir /data/vendor/port_bridge 0770 radio radio
     chmod 0770 /data/vendor/port_bridge
 
-service vendor.port-bridge /vendor/bin/port-bridge
+service vendor.port-bridge /system/vendor/bin/port-bridge
     class main
     user radio
     group radio system inet
diff --git a/sdm660-common/proprietary/vendor/etc/init/qcrild.rc b/sdm660-common/proprietary/vendor/etc/init/qcrild.rc
index 8aabd73..1ba041c 100644
--- a/sdm660-common/proprietary/vendor/etc/init/qcrild.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/qcrild.rc
@@ -1,7 +1,6 @@
 service vendor.qcrild /vendor/bin/hw/qcrild
     class main
     user radio
-    disabled
     group radio cache inet misc audio log readproc wakelock oem_2901
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
 
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc
deleted file mode 100644
index 03b7d0d..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-service dms-hal-2-0 /vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service
-    class hal
-    user media
-    group audio media
-on post-fs-data
-    mkdir /data/vendor/dolby 0770 media media
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
index 2803ce9..bfe1072 100644
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
@@ -8,4 +8,4 @@ service alarm-hal-1-0 /vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
     user system
     group system
     oneshot
-    disabled
+    disabled
\ No newline at end of file
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc
new file mode 100755
index 0000000..2ca0d64
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc
@@ -0,0 +1,13 @@
+#  @file    vendor.qti.hardware.perf@2.2-service.rc
+#  @brief   Defination perf service
+#
+#  DESCRIPTION
+#  ---------------------------------------------------------------------------
+#       Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
+#       All Rights Reserved.
+#       Confidential and Proprietary - Qualcomm Technologies, Inc.
+#  ---------------------------------------------------------------------------
+service perf-hal-2-2 /vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
+    class hal
+    user root
+    group root readproc oem_2907
diff --git a/sdm660-common/proprietary/vendor/etc/perf/commonresourceconfigs.xml b/sdm660-common/proprietary/vendor/etc/perf/commonresourceconfigs.xml
new file mode 100755
index 0000000..050f30ac
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/perf/commonresourceconfigs.xml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Copyright (c) 2017 Qualcomm Technologies, Inc.
+ * All Rights Reserved.
+ * Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<!-- Supported XML tags with their fields.
+ * Major tag supports OpcodeValue.
+ * Minor tag supports OpcodeValue, Nodepath and Supported(Optional) fields.
+ * By default, all the resources are assumed as supported.
+ Supported field can be used to mark a resource as not supported.
+ * All the interactive nodes, ondemand nodes and some nodes of sched major
+ group which aren't being used are marked as Not supported by default and
+ can be enabled by using the target specific config files. -->
+
+<!-- For resources which update multiple nodes or which require speical
+acquire/release funcitons, need to mention the keyword SPECIAL_NODE
+in their node path field and accordingly their ApplyOts and ResetOpts
+functions need to be defined in the code.-->
+
+<!-- For adding a new resource, a new minor tag with all mandatory fields
+need to be added just before the end of it's major group. -->
+
+<ResourceConfigs>
+    <PerfResources>
+
+    <!-- display off major start -->
+    <Major OpcodeValue="0x0" />
+        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - display_off" />
+    <!-- display off major end -->
+
+    <!-- power collapse major start -->
+    <Major OpcodeValue="0x1" />
+        <Minor OpcodeValue="0x0" Node="/dev/cpu_dma_latency" />
+        <Minor OpcodeValue="0x1" Node="/sys/module/lpm_levels/system/perf/perf-l2-pc/idle_enabled" />
+        <Minor OpcodeValue="0x2" Node="/sys/module/lpm_levels/parameters/bias_hyst" />
+        <Minor OpcodeValue="0x3" Node="/sys/module/lpm_levels/parameters/ref_stddev" />
+        <Minor OpcodeValue="0x4" Node="/sys/module/lpm_levels/parameters/tmr_add" />
+        <Minor OpcodeValue="0x5" Node="/sys/module/lpm_levels/parameters/lpm_ipi_prediction" Supported="no" />
+    <!-- power collapse major end -->
+
+    <!-- cpufreq major start -->
+    <Major OpcodeValue="0x2" />
+        <Minor OpcodeValue="0x0" Node="/sys/module/msm_performance/parameters/cpu_min_freq" />
+        <Minor OpcodeValue="0x1" Node="/sys/module/msm_performance/parameters/cpu_max_freq" />
+    <!-- cpufreq major end -->
+
+    <!-- sched major start -->
+    <Major OpcodeValue="0x3" />
+        <!--Sysfsnode paths may change basing on the target for minors 0x1, 0x4, 0x5, 0x9.
+            So, for targets with different node paths than default, need to be specified
+            in the target specific resource config xml file. -->
+        <Minor OpcodeValue="0x0" Node="/proc/sys/kernel/sched_boost" />
+        <Minor OpcodeValue="0x1" Node="/proc/sys/kernel/sched_prefer_idle" Supported="no" />
+        <Minor OpcodeValue="0x2" Node="/proc/sys/kernel/sched_migration_cost_ns" />
+        <Minor OpcodeValue="0x3" Node="/proc/sys/kernel/sched_small_task" />
+        <Minor OpcodeValue="0x4" Node="/proc/sys/kernel/sched_mostly_idle_load" Supported="no" />
+        <Minor OpcodeValue="0x5" Node="/proc/sys/kernel/sched_mostly_idle_nr_run" Supported="no" />
+        <Minor OpcodeValue="0x6" Node="/proc/sys/kernel/sched_init_task_load" />
+        <Minor OpcodeValue="0x7" Node="/proc/sys/kernel/sched_upmigrate" />
+        <Minor OpcodeValue="0x8" Node="/proc/sys/kernel/sched_downmigrate" />
+        <Minor OpcodeValue="0x9" Node="/proc/sys/kernel/sched_mostly_idle_freq" Supported="no" />
+        <Minor OpcodeValue="0xA" Node="SPECIAL_NODE - sched_add_group" />
+        <Minor OpcodeValue="0xB" Node="/proc/sys/kernel/sched_spill_nr_run" />
+        <Minor OpcodeValue="0xC" Node="/sys/devices/system/cpu/cpu0/sched_static_cpu_pwr_cost" />
+        <Minor OpcodeValue="0xD" Node="/proc/sys/kernel/sched_restrict_cluster_spill" />
+        <Minor OpcodeValue="0xE" Node="SPECIAL_NODE - sched_freq_add_group" />
+        <Minor OpcodeValue="0xF" Node="/dev/cpuset/top-app/cpus" />
+        <Minor OpcodeValue="0x10" Node="/dev/cpuset/foreground/cpus" />
+        <Minor OpcodeValue="0x11" Node="/dev/cpuset/system-background/cpus" />
+        <Minor OpcodeValue="0x12" Node="/dev/cpuset/background/cpus" />
+        <Minor OpcodeValue="0x13" Node="/proc/sys/kernel/sched_freq_aggregate" />
+        <Minor OpcodeValue="0x14" Node="/proc/sys/kernel/sched_enable_thread_grouping" />
+        <Minor OpcodeValue="0x15" Node="/proc/sys/kernel/sched_group_upmigrate" />
+        <Minor OpcodeValue="0x16" Node="/proc/sys/kernel/sched_group_downmigrate" />
+        <!-- sched_freq_aggr_threshold perflock will have contention with sched_boost level 3,
+        so disable this resource for the target which is going to use sched boost 3 level.-->
+        <Minor OpcodeValue="0x17" Node="/proc/sys/kernel/sched_freq_aggregate_threshold" />
+        <Minor OpcodeValue="0x18" Node="/dev/stune/top-app/schedtune.prefer_idle" />
+        <Minor OpcodeValue="0x19" Node="/proc/sys/kernel/sched_initial_task_util" />
+        <Minor OpcodeValue="0x1A" Node="/sys/devices/system/cpu/cpu0/sched_load_boost" />
+        <Minor OpcodeValue="0x1B" Node="/proc/sys/kernel/sched_little_cluster_coloc_fmin_khz" />
+        <Minor OpcodeValue="0x1C" Node="/dev/stune/top-app/schedtune.boost" />
+        <Minor OpcodeValue="0x1D" Node="/proc/sys/kernel/sched_busy_hysteresis_enable_cpus" />
+        <Minor OpcodeValue="0x1E" Node="/proc/sys/kernel/sched_min_task_util_for_colocation" />
+        <Minor OpcodeValue="0x1F" Node="/proc/sys/kernel/sched_min_task_util_for_boost" />
+        <Minor OpcodeValue="0x20" Node="/proc/%d/sched_boost" Supported="yes"/> <!-- sched_task_boost -->
+        <Minor OpcodeValue="0x21" Node="/proc/sys/kernel/sched_user_hint" /> <!--sched_user_hint -->
+        <Minor OpcodeValue="0x22" Node="/proc/sys/kernel/sched_task_unfilter_nr_windows" /> <!--sched_task_unfilter_nr_windows -->
+        <Minor OpcodeValue="0x23" Node="/proc/sys/kernel/sched_coloc_downmigrate_ns" /> <!--sched_coloc_downmigrate_ns  -->
+        <Minor OpcodeValue="0x24" Node="/proc/sys/kernel/sched_coloc_busy_hysteresis_enable_cpus" />
+        <Minor OpcodeValue="0x25" Node="/proc/sys/kernel/sched_coloc_busy_hyst_ns" />
+        <Minor OpcodeValue="0x26" Node="/proc/sys/kernel/sched_window_stats_policy" />
+        <Minor OpcodeValue="0x27" Node="/proc/sys/kernel/sched_many_wakeup_threshold" />
+        <Minor OpcodeValue="0x28" Node="/proc/sys/kernel/sched_sync_hint_enable" />
+        <Minor OpcodeValue="0x29" Node="/proc/sys/kernel/sched_ravg_window_nr_ticks" />
+        <Minor OpcodeValue="0x2A" Node="/proc/sys/kernel/sched_prefer_spread" />
+        <Minor OpcodeValue="0x2B" Node="/dev/cpuctl/top-app/cpu.uclamp.min" />
+        <Minor OpcodeValue="0x2C" Node="/proc/%d/sched_boost" Supported="yes" /> <!-- enable sched_task_boost for top-app render thread-->
+        <Minor OpcodeValue="0x2D" Node="/proc/%d/sched_boost" Supported="yes" /> <!-- disable sched_task_boost for top-app render thread-->
+        <Minor OpcodeValue="0x2E" Node="/proc/sys/walt/sched_task_unfilter_period" />
+        <Minor OpcodeValue="0x2F" Node="/proc/sys/walt/sched_conservative_pl" />
+        <Minor OpcodeValue="0x30" Node="/proc/sys/walt/sched_coloc_busy_hyst_cpu_busy_pct" />
+        <Minor OpcodeValue="0x31" Node="/proc/sys/walt/sched_coloc_busy_hyst_cpu_ns" />
+        <Minor OpcodeValue="0x32" Node="/proc/sys/kernel/walt_rtg_cfs_boost_prio" />
+        <Minor OpcodeValue="0x33" Node="/proc/sys/kernel/sched_force_lb_enable" Supported="yes" />
+        <Minor OpcodeValue="0x34" Node="/proc/%d/sched_low_latency" Supported="yes" />
+        <Minor OpcodeValue="0x35" Node="/proc/sys/kernel/sched_min_granularity_ns" />
+        <Minor OpcodeValue="0x36" Node="/proc/sys/kernel/walt_low_latency_task_threshold" />
+        <Minor OpcodeValue="0x37" Node="/dev/stune/foreground/schedtune.prefer_idle" />
+        <Minor OpcodeValue="0x38" Node="/proc/sys/kernel/%s" Supported="no"/>
+        <Minor OpcodeValue="0x39" Node="/dev/stune/top-app/schedtune.colocate" />
+        <Minor OpcodeValue="0x3A" Node="/dev/cpuctl/top-app/cpu.uclamp.latency_sensitive" />
+        <Minor OpcodeValue="0x3B" Node="/dev/cpuctl/foreground/cpu.uclamp.latency_sensitive" />
+    <!-- sched major end -->
+
+    <!-- core hotplug major start -->
+    <Major OpcodeValue="0x4" />
+        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - lock_min_cores" />
+        <Minor OpcodeValue="0x1" Node="SPECIAL_NODE - lock_max_cores" />
+    <!-- core hotplug major end-->
+
+    <!-- interactive major start -->
+    <Major OpcodeValue="0x5" />
+        <!-- For following minors node paths might change basing on GovInstanceType and
+        Supported field might change basing on the type of CpufreqGov.-->
+        <Minor OpcodeValue="0x0" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay" Supported="no" />
+        <Minor OpcodeValue="0x1" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/boost" Supported="no" />
+        <Minor OpcodeValue="0x2" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/boostpulse" Supported="no" />
+        <Minor OpcodeValue="0x3" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/boostpulse_duration" Supported="no" />
+        <Minor OpcodeValue="0x4" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load" Supported="no" />
+        <Minor OpcodeValue="0x5" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq" Supported="no" />
+        <Minor OpcodeValue="0x6" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/io_is_busy" Supported="no" />
+        <Minor OpcodeValue="0x7" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/min_sample_time" Supported="no" />
+        <Minor OpcodeValue="0x8" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/target_loads" Supported="no" />
+        <Minor OpcodeValue="0x9" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/timer_rate" Supported="no" />
+        <Minor OpcodeValue="0xA" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/timer_slack" Supported="no" />
+        <Minor OpcodeValue="0xB" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/max_freq_hysteresis" Supported="no" />
+        <Minor OpcodeValue="0xC" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/use_sched_load" Supported="no" />
+        <Minor OpcodeValue="0xD" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/use_migration_notif" Supported="no" />
+        <Minor OpcodeValue="0xE" Node="/sys/devices/system/cpu/cpu0/cpufreq/interactive/ignore_hispeed_on_notif" Supported="no" />
+        <Minor OpcodeValue="0xF" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq" />
+        <Minor OpcodeValue="0x10" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_load" />
+        <Minor OpcodeValue="0x11" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/pl" />
+        <Minor OpcodeValue="0x12" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us" />
+        <Minor OpcodeValue="0x13" Node="/sys/devices/system/cpu/cpu0/cpufreq/schedutil/rtg_boost_freq" />
+    <!-- interactive major end -->
+
+    <!-- cpubw hwmon major start -->
+    <Major OpcodeValue="0x6" />
+        <!-- ALl the following minors might change based on target. -->
+        <Minor OpcodeValue="0x0" Node="/sys/class/devfreq/soc:qcom,cpubw/min_freq" />
+        <Minor OpcodeValue="0x1" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/decay_rate" />
+        <Minor OpcodeValue="0x2" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/io_percent" />
+        <Minor OpcodeValue="0x3" Node="SPECIAL_NODE - cpubw_hwmon_hyst_opt" />
+        <Minor OpcodeValue="0x4" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/low_power_ceil_mbps" />
+        <Minor OpcodeValue="0x5" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/low_power_io_percent" />
+        <Minor OpcodeValue="0x6" Node="/sys/class/devfreq/soc:qcom,cpubw/max_freq" />
+        <Minor OpcodeValue="0x7" Node="/sys/class/devfreq/soc:qcom,cpubw/polling_interval" />
+        <Minor OpcodeValue="0x8" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/sample_ms" />
+        <Minor OpcodeValue="0x9" Node="/sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/idle_mbps" />
+        <!--Here onwards are the path for new opcodes to mark CPU_LLCC_BW nodes.Upper ones
+            of this major are marked as unsupported for the tergets using the new opcodes-->
+        <Minor OpcodeValue="0xA" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/min_freq" />
+        <Minor OpcodeValue="0xB" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/up_scale" />
+        <Minor OpcodeValue="0xC" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/use_ab" />
+        <Minor OpcodeValue="0xD" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/io_percent" />
+        <Minor OpcodeValue="0xE" Node="SPECIAL_NODE - llcbw_hwmon_hyst_opt" />
+        <Minor OpcodeValue="0xF" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/bw_hwmon/sample_ms" />
+        <Minor OpcodeValue="0x10" Node="/sys/class/devfreq/soc:qcom,cpu-cpu-llcc-bw/polling_interval" />
+    <!-- cpubw hwmon major end -->
+
+    <!-- video major start -->
+    <Major OpcodeValue="0x7" />
+        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - handle_vid_encplay_hint" />
+        <Minor OpcodeValue="0x1" Node="SPECIAL_NODE - handle_vid_decplay_hint" />
+        <Minor OpcodeValue="0x2" Node="SPECIAL_NODE - handle_disp_hint" />
+    <!-- video major end -->
+
+    <!-- ksm major start -->
+    <Major OpcodeValue="0x8" />
+        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - disable_ksm" />
+        <Minor OpcodeValue="0x1" Node="SPECIAL_NODE - set_ksm_param" />
+    <!-- ksm major end -->
+
+    <!-- ondemand major start -->
+    <Major OpcodeValue="0x9" />
+        <Minor OpcodeValue="0x0" Node="/sys/devices/system/cpu/cpufreq/ondemand/sampling_rate" Supported="no" />
+        <Minor OpcodeValue="0x1" Node="/sys/devices/system/cpu/cpufreq/ondemand/io_is_busy" Supported="no" />
+        <Minor OpcodeValue="0x2" Node="/sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor" Supported="no" />
+        <Minor OpcodeValue="0x3" Node="/sys/devices/system/cpu/cpufreq/ondemand/sync_freq" Supported="no" />
+        <Minor OpcodeValue="0x4" Node="/sys/devices/system/cpu/cpufreq/ondemand/optimal_freq" Supported="no" />
+        <Minor OpcodeValue="0x5" Node="/sys/devices/system/cpu/cpufreq/ondemand/enable_stepup" Supported="no" />
+        <Minor OpcodeValue="0x6" Node="/sys/devices/system/cpu/cpufreq/ondemand/max_intermediate_steps" Supported="no" />
+        <Minor OpcodeValue="0x7" Node="/dev/cpuctl/cpu.notify_on_migrate" Supported="no" />
+    <!-- ondemand major end -->
+
+    <!-- gpu major start -->
+    <Major OpcodeValue="0xA" />
+        <Minor OpcodeValue="0x0" Node="/sys/class/kgsl/kgsl-3d0/default_pwrlevel" />
+        <Minor OpcodeValue="0x1" Node="/sys/class/kgsl/kgsl-3d0/min_pwrlevel" />
+        <Minor OpcodeValue="0x2" Node="/sys/class/kgsl/kgsl-3d0/max_pwrlevel" />
+        <Minor OpcodeValue="0x3" Node="/sys/class/kgsl/kgsl-3d0/devfreq/min_freq" />
+        <Minor OpcodeValue="0x4" Node="/sys/class/kgsl/kgsl-3d0/devfreq/max_freq" />
+        <Minor OpcodeValue="0x5" Node="/sys/class/devfreq/soc:qcom,gpubw/min_freq" />
+        <Minor OpcodeValue="0x6" Node="/sys/class/devfreq/soc:qcom,gpubw/max_freq" />
+        <Minor OpcodeValue="0x7" Node="SPECIAL_NODE - gpu_disable_gpu_nap" />
+        <Minor OpcodeValue="0x8" Node="/sys/class/kgsl/kgsl/proc/%d/state" />
+        <Minor OpcodeValue="0x9" Node="/sys/class/kgsl/kgsl/proc/%d/state" />
+        <Minor OpcodeValue="0xA" Node="/sys/class/kgsl/kgsl-3d0/devfreq/mod_percent" />
+    <!-- gpu major end -->
+
+    <!-- misc major start -->
+    <Major OpcodeValue="0xB" />
+        <Minor OpcodeValue="0x0" Node="SPECIAL_NODE - unsupported" />
+        <Minor OpcodeValue="0x1" Node="SPECIAL_NODE - irq_balancer" />
+        <Minor OpcodeValue="0x2" Node="/sys/module/cpu_boost/parameters/input_boost_freq" />
+        <Minor OpcodeValue="0x3" Node="/proc/sys/vm/swap_ratio" />
+        <Minor OpcodeValue="0x4" Node="StorageNode_path_is_figured_out_based_on_the_target_device" />
+        <Minor OpcodeValue="0x5" Node="SPECIAL_NODE - dummy_or_keep_alive" />
+        <Minor OpcodeValue="0x6" Node="/sys/module/process_reclaim/parameters/enable_process_reclaim" />
+        <Minor OpcodeValue="0x7" Node="SPECIAL_NODE - disable_pasr" />
+    <!-- misc major end -->
+
+    <!-- llcbw hwmon major start -->
+    <Major OpcodeValue="0xC" />
+        <!-- ALl the following minors node path might change based on target. -->
+        <Minor OpcodeValue="0x0" Node="/sys/class/devfreq/soc:qcom,llccbw/min_freq" />
+        <Minor OpcodeValue="0x1" Node="/sys/class/devfreq/soc:qcom,llccbw/bw_hwmon/io_percent" />
+        <Minor OpcodeValue="0x2" Node="SPECIAL_NODE - llcbw_hwmon_hyst_opt" />
+        <Minor OpcodeValue="0x3" Node="/sys/class/devfreq/soc:qcom,llccbw/bw_hwmon/sample_ms" />
+        <!--Here onwards are the path for new opcodes to mark LLCC_DDR_BW nodes.Upper ones
+            of this major are marked as unsupported for the tergets using the new opcodes-->
+        <Minor OpcodeValue="0x4" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/min_freq" />
+        <Minor OpcodeValue="0x5" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/up_scale" />
+        <Minor OpcodeValue="0x6" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/max_freq" />
+        <Minor OpcodeValue="0x7" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/decay_rate" />
+        <Minor OpcodeValue="0x8" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/io_percent" />
+        <Minor OpcodeValue="0x9" Node="SPECIAL_NODE - cpubw_hwmon_hyst_opt" />
+        <Minor OpcodeValue="0xA" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/low_power_ceil_mbps" />
+        <Minor OpcodeValue="0xB" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/low_power_io_percent" />
+        <Minor OpcodeValue="0xC" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/polling_interval" />
+        <Minor OpcodeValue="0xD" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/sample_ms" />
+        <Minor OpcodeValue="0xE" Node="/sys/class/devfreq/soc:qcom,cpu-llcc-ddr-bw/bw_hwmon/idle_mbps" />
+
+    <!-- llcbw hwmon major end -->
+
+    <!-- memlat major start -->
+    <Major OpcodeValue="0xD" />
+        <!-- ALl the following minors node path might change based on target. -->
+        <Minor OpcodeValue="0x0" Node="/sys/class/devfreq/soc:qcom,l3-cpu%d/min_freq" />
+        <Minor OpcodeValue="0x1" Node="/sys/class/devfreq/soc:qcom,memlat-cpu0/mem_latency/ratio_ceil" />
+        <Minor OpcodeValue="0x2" Node="/sys/class/devfreq/soc:qcom,memlat-cpu4/mem_latency/ratio_ceil" />
+        <Minor OpcodeValue="0x3" Node="/sys/class/devfreq/soc:qcom,memlat-cpu0/mem_latency/stall_floor" />
+        <Minor OpcodeValue="0x4" Node="/sys/class/devfreq/soc:qcom,memlat-cpu4/mem_latency/stall_floor" />
+        <Minor OpcodeValue="0x5" Node="/sys/class/devfreq/soc:qcom,memlat-cpu0/min_freq" />
+        <Minor OpcodeValue="0x6" Node="/sys/class/devfreq/soc:qcom,memlat-cpu4/min_freq" />
+        <Minor OpcodeValue="0x7" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-llcc-lat/min_freq" />
+        <Minor OpcodeValue="0x8" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-llcc-lat/mem_latency/ratio_ceil" />
+        <Minor OpcodeValue="0x9" Node="/sys/class/devfreq/soc:qcom,cpu4-cpu-llcc-lat/mem_latency/ratio_ceil" />
+        <Minor OpcodeValue="0xA" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-llcc-lat/mem_latency/stall_floor" />
+        <Minor OpcodeValue="0xB" Node="/sys/class/devfreq/soc:qcom,cpu4-cpu-llcc-lat/mem_latency/stall_floor" />
+        <Minor OpcodeValue="0xC" Node="/sys/class/devfreq/soc:qcom,cpu0-llcc-ddr-lat/min_freq" />
+        <Minor OpcodeValue="0xD" Node="/sys/class/devfreq/soc:qcom,cpu0-llcc-ddr-lat/mem_latency/ratio_ceil" />
+        <Minor OpcodeValue="0xE" Node="/sys/class/devfreq/soc:qcom,cpu4-llcc-ddr-lat/mem_latency/ratio_ceil" />
+        <Minor OpcodeValue="0xF" Node="/sys/class/devfreq/soc:qcom,cpu0-llcc-ddr-lat/mem_latency/stall_floor" />
+        <Minor OpcodeValue="0x10" Node="/sys/class/devfreq/soc:qcom,cpu4-llcc-ddr-lat/mem_latency/stall_floor" />
+        <Minor OpcodeValue="0x11" Node="/sys/class/devfreq/18321000.qcom,devfreq-l3:qcom,cpu%d-cpu-l3-lat/max_freq" />
+        <Minor OpcodeValue="0x12" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-ddr-latfloor/min_freq" />
+        <Minor OpcodeValue="0x13" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-ddr-latfloor/max_freq" />
+        <Minor OpcodeValue="0x14" Node="/sys/class/devfreq/soc:qcom,cpu0-cpu-llcc-lat/max_freq" />
+        <Minor OpcodeValue="0x15" Node="/sys/class/devfreq/soc:qcom,cpu0-llcc-ddr-lat/max_freq" />
+    <!-- memlat major end -->
+
+    <!-- npu major start -->
+    <Major OpcodeValue="0xE" />
+        <!-- ALl the following minors node path might change based on target. -->
+        <Minor OpcodeValue="0x0" Node="/sys/class/devfreq/soc:qcom,npu-npu-llcc-bw/bw_hwmon/sample_ms" />
+        <Minor OpcodeValue="0x1" Node="/sys/class/devfreq/soc:qcom,npu-npu-llcc-bw/bw_hwmon/io_percent" />
+        <Minor OpcodeValue="0x2" Node="SPECIAL_NODE - npu_llcbw_hwmon_hyst_opt" />
+        <!--Here onwards are the path for new opcodes to mark NPU_LLCC_DDR_BW nodes.-->
+        <Minor OpcodeValue="0x3" Node="/sys/class/devfreq/soc:qcom,npu-llcc-ddr-bw/bw_hwmon/sample_ms" />
+        <Minor OpcodeValue="0x4" Node="/sys/class/devfreq/soc:qcom,npu-llcc-ddr-bw/bw_hwmon/io_percent" />
+        <Minor OpcodeValue="0x5" Node="SPECIAL_NODE - npu_ddr_llcbw_hwmon_hyst_opt" />
+    <!-- npu major end -->
+
+    </PerfResources>
+</ResourceConfigs>
diff --git a/sdm660-common/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml b/sdm660-common/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml
new file mode 100755
index 0000000..22db738
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+/* Copyright (c) 2021 Qualcomm Technologies, Inc.
+ * All Rights Reserved.
+ * Confidential and Proprietary - Qualcomm Technologies, Inc.
+ */
+-->
+
+<ResourceConfigs>
+    <PerfResources>
+        <SysNode Idx="0x0" Node="/sys/module/msm_performance/parameters/num_clusters" />
+        <SysNode Idx="0x1" Node="/sys/module/msm_performance/parameters/managed_cpus" />
+        <SysNode Idx="0x2" Node="/sys/module/msm_performance/parameters/cpu_max_freq" />
+        <SysNode Idx="0x3" Node="/sys/module/msm_performance/events/cpu_hotplug" />
+        <SysNode Idx="0x4" Node="/sys/module/msm_performance/parameters/max_cpus" />
+        <SysNode Idx="0x5" Node="/sys/module/msm_performance/parameters/inst" />
+        <SysNode Idx="0x6" Node="/sys/module/msm_performance/parameters/splh_notif" />
+        <SysNode Idx="0x7" Node="/sys/module/msm_performance/notify/gfx_evt" />
+        <SysNode Idx="0x8" Node="/sys/module/msm_performance/parameters/evnt_gplaf_pid" />
+    </PerfResources>
+</ResourceConfigs>
\ No newline at end of file
diff --git a/sdm660-common/proprietary/vendor/etc/perf/perfboostsconfig.xml b/sdm660-common/proprietary/vendor/etc/perf/perfboostsconfig.xml
new file mode 100644
index 0000000..c6538e8
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/perf/perfboostsconfig.xml
@@ -0,0 +1,475 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+/* Copyright (c) 2017 Qualcomm Technologies, Inc.
+ * All Rights Reserved.
+ * Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+
+<!--Ids are used in identifying the boosts, increment ids linearly,
+    do not modify Ids, or add in between-->
+<!--follow the number format rules while specifying number, can be given
+    in any format-->
+
+<BoostConfigs>
+    <PerfBoost>
+
+    <!--app lauch boost-->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
+        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
+
+        <!-- Type="1", main launch boost of 2sec -->
+        <Config
+            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="sdm660"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1747,
+                       0x40800100, 1400" />
+
+        <Config
+            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="sdm658"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1747,
+                       0x40800100, 1400" />
+
+    <!--sdm630,sdm455 app lauch boost-->
+        <!-- SCHEDBOOST resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHED_SPILL_NR_RUN resource opcode, value -->
+        <!-- SCHED_RESTRICT_CLUSTER_SPILL resource opcode, value -->
+
+        <!-- Type="1", main launch boost of 2sec -->
+        <Config
+            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="sdm630"
+            Resources="0x40C00000, 0x1, 0x40800000, 1880,
+                       0x40800100, 1720, 0x40C2C000, 1, 0x40C34000, 0" />
+
+        <Config
+            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="sdm455"
+            Resources="0x40C00000, 0x1, 0x40800000, 1880,
+                       0x40800100, 1720, 0x40C2C000, 1, 0x40C34000, 0" />
+
+    <!--app lauch boost (disabling packing)-->
+        <!-- POWER COLLAPSE resource opcode, value-->
+        <!-- STORAGE CLK SCALING resource opcode, value-->
+
+        <!-- Type="2", launch boost for disable packing 1.5sec -->
+        <Config
+            Id="0x00001081" Type="2" Enable="true" Timeout="1500" Target="sdm660"
+            Resources="0x40400000, 0x1, 0x42C10000, 0x1" />
+
+        <Config
+            Id="0x00001081" Type="2" Enable="true" Timeout="1500" Target="sdm658"
+            Resources="0x40400000, 0x1, 0x42C10000, 0x1" />
+
+    <!--sdm630,sdm455 app lauch boost (disabling packing)-->
+        <!-- POWER COLLAPSE resource opcode, value-->
+
+        <!-- Type="2", launch boost for disable packing 1.5sec -->
+        <Config
+            Id="0x00001081" Type="2" Enable="true" Timeout="1500" Target="sdm630"
+            Resources="0x40400000, 0x1" />
+
+        <Config
+            Id="0x00001081" Type="2" Enable="true" Timeout="1500" Target="sdm455"
+            Resources="0x40400000, 0x1" />
+
+    <!-- config_enableLaunchBoostv3-->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- SCHED GROUP DOWNMIGRATE resource opcode, value-->
+        <!-- SCHED GROUP UPMIGRATE resource opcode, value-->
+
+        <!-- Type="3", FA launch boost of 15sec -->
+        <Config
+            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="sdm660" Kernel="4.4"
+            Resources="0x40C5C000, 50, 0x40C58000, 95, 0x40C54000, 100" />
+
+        <Config
+            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="sdm660" Kernel="4.14"
+            Resources="0x40C58000, 95, 0x40C54000, 100" />
+
+        <Config
+            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="sdm660" Kernel="4.19"
+            Resources="0x40C58000, 95, 0x40C54000, 100" />
+
+        <Config
+            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="sdm658"
+            Resources="0x40C5C000, 50, 0x40C58000, 95, 0x40C54000, 100" />
+
+    <!--sdm630,sdm455 config_enableLaunchBoostv3-->
+        <!-- SCHED FREQ AGGR THRESHOLD resource opcode, value-->
+
+        <!-- Type="3", FA launch boost of 15sec -->
+        <Config
+            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="sdm630"
+            Resources="0x40C5C000, 80" />
+
+        <Config
+            Id="0x00001081" Type="3" Enable="true" Timeout="15000" Target="sdm455"
+            Resources="0x40C5C000, 80" />
+
+    <!--Vertical Scroll boost-->
+        <!-- CPUBW_MIN_FREQ resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- ABOVE_HISPEED_DELAY_BIG resource opcode, value-->
+        <!-- IO_IS_BUSY_BIG resource opcode, value-->
+        <!-- SCHED FREQ_AGGR_THRH resource opcode,value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="1", Vertical Scroll boost -->
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm660" Resolution="1080p" Kernel="4.4"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40"  />
+
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm660" Resolution="2560" Kernel="4.4"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40, 0x4280C000, 266"  />
+
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm658" Resolution="1080p"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40"  />
+
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm658" Resolution="2560"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40, 0x4280C000, 266"  />
+
+    <!--sdm660,K4.14 Vertical Scroll boost-->
+        <!-- CPUBW_MIN_FREQ resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="1", Vertical Scroll boost -->
+
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm660" Resolution="1080p" Kernel="4.14"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2"  />
+
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm660" Resolution="2560" Kernel="4.14"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2, 0x4280C000, 266"  />
+
+    <!--sdm660,K4.19 Vertical Scroll boost-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="1", Vertical Scroll boost -->
+
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm660" Resolution="1080p" Kernel="4.19"
+            Resources="0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2"  />
+
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm660" Resolution="2560" Kernel="4.19"
+            Resources="0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2, 0x4280C000, 266"  />
+
+    <!--sdm630,sdm455 Vertical Scroll boost-->
+        <!-- CPUBW_MIN_FREQ resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHED FREQ_AGGR_THRH resource opcode,value-->
+
+        <!-- Type="1", Vertical Scroll boost -->
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm630"
+            Resources="0x41800000, 0x1C, 0x40800000, 1344, 0x40800100, 600,
+                       0x40C5C000, 80"  />
+
+        <Config
+            Id="0x00001080" Type="1" Enable="true" Target="sdm455"
+            Resources="0x41800000, 0x1C, 0x40800000, 1344, 0x40800100, 600,
+                       0x40C5C000, 80"  />
+
+    <!--Horizontal Scroll boost-->
+        <!-- CPUBW_MIN_FREQ resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- ABOVE_HISPEED_DELAY_BIG resource opcode, value-->
+        <!-- IO_IS_BUSY_BIG resource opcode, value-->
+        <!-- SCHED FREQ_AGGR_THRH resource opcode,value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="2", Horizontal Scroll boost -->
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm660" Resolution="1080p" Kernel="4.4"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40"  />
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm660" Resolution="2560" Kernel="4.4"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40, 0x4280C000, 266"  />
+
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm658" Resolution="1080p"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40"  />
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm658" Resolution="2560"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40, 0x4280C000, 266"  />
+
+    <!--sdm660,K4.14 Horizontal Scroll boost-->
+        <!-- CPUBW_MIN_FREQ resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="2", Horizontal Scroll boost -->
+
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm660" Resolution="1080p" Kernel="4.14"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2"  />
+
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm660" Resolution="2560" Kernel="4.14"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2, 0x4280C000, 266"  />
+
+    <!--sdm660,K4.19 Horizontal Scroll boost-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="2", Horizontal Scroll boost -->
+
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm660" Resolution="1080p" Kernel="4.19"
+            Resources="0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2"  />
+
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm660" Resolution="2560" Kernel="4.19"
+            Resources="0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2, 0x4280C000, 266"  />
+
+    <!--sdm630,sdm455 Horizontal Scroll boost-->
+        <!-- CPUBW_MIN_FREQ resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHED FREQ_AGGR_THRH resource opcode,value-->
+
+        <!-- Type="2", Horizontal Scroll boost -->
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm630"
+            Resources="0x41800000, 0x1C, 0x40800000, 1344, 0x40800100, 600,
+                       0x40C5C000, 80"  />
+
+        <Config
+            Id="0x00001080" Type="2" Enable="true" Target="sdm455"
+            Resources="0x41800000, 0x1C, 0x40800000, 1344, 0x40800100, 600,
+                       0x40C5C000, 80"  />
+
+    <!--Pre-Fling boost-->
+        <!-- CPUBW_MIN_FREQ resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- ABOVE_HISPEED_DELAY_BIG resource opcode, value-->
+        <!-- IO_IS_BUSY_BIG resource opcode, value-->
+        <!-- SCHED FREQ_AGGR_THRH resource opcode,value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="4", Pre-Fling boost -->
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm660" Resolution="1080p" Kernel="4.4"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40"  />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm660" Resolution="2560" Kernel="4.4"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40, 0x4280C000, 266"  />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm658" Resolution="1080p"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40"  />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm658" Resolution="2560"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40, 0x4280C000, 266"  />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm630"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40"  />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm455"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2,
+                       0x41400000, 1, 0x41418000, 1, 0x40C5C000, 40"  />
+
+    <!--sdm660,K4.14 Pre-Fling boost-->
+        <!-- CPUBW_MIN_FREQ resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="4", Pre-Fling boost -->
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm660" Resolution="1080p" Kernel="4.14"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2"  />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm660" Resolution="2560" Kernel="4.14"
+            Resources="0x41800000, 0x31, 0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2, 0x4280C000, 266"  />
+
+    <!--sdm660,K4.19 Pre-Fling boost-->
+        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- GPU MIN-FREQUENCY resource opcode,value-->
+
+        <!-- Type="4", Pre-Fling boost -->
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm660" Resolution="1080p" Kernel="4.19"
+            Resources="0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2"  />
+
+        <Config
+            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm660" Resolution="2560" Kernel="4.19"
+            Resources="0x40800000, 1100, 0x40800100, 1100, 0x40C00000, 2, 0x4280C000, 266"  />
+
+    <!--MTP boost-->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
+        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
+        <!-- STORAGE CLK SCALING resource opcode, value-->
+
+        <!-- Type="", MTP boost -->
+
+        <Config
+            Id="0x00001086" Enable="true" Target="sdm660"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1800,
+                       0x40800100, 1400, 0x42C10000, 0x1" />
+
+        <Config
+            Id="0x00001086" Enable="true" Target="sdm658"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1800,
+                       0x40800100, 1400, 0x42C10000, 0x1" />
+
+        <Config
+            Id="0x00001086" Enable="true" Target="sdm630"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1800,
+                       0x40800100, 1400, 0x42C10000, 0x1" />
+
+        <Config
+            Id="0x00001086" Enable="true" Target="sdm455"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 1800,
+                       0x40800100, 1400, 0x42C10000, 0x1" />
+    <!--PackageInstall boost-->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
+        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
+        <!-- Type="", Package Install boost -->
+
+        <Config
+            Id="0x00001088" Enable="true" Target="sdm660"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
+                       0x40800100,0xFFF" />
+        <Config
+            Id="0x00001088" Enable="true" Target="sdm658"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
+                       0x40800100,0xFFF" />
+        <Config
+            Id="0x00001088" Enable="true" Target="sdm630"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
+                       0x40800100,0xFFF" />
+        <Config
+            Id="0x00001088" Enable="true" Target="sdm455"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
+                       0x40800100,0xFFF" />
+
+    <!--Rotation latency boost-->
+        <!-- SCHEDBOOST resource opcode, value-->
+        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->
+        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
+        <!-- Type="", Rotation latency boost -->
+
+        <Config
+            Id="0x00001089" Enable="true" Timeout="1500" Target="sdm660"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
+                       0x40800100,0xFFF" />
+        <Config
+            Id="0x00001089" Enable="true" Timeout="1500" Target="sdm658"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
+                       0x40800100,0xFFF" />
+        <Config
+            Id="0x00001089" Enable="true" Timeout="1500" Target="sdm630"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
+                       0x40800100,0xFFF" />
+
+        <Config
+            Id="0x00001089" Enable="true" Timeout="1500" Target="sdm455"
+            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000,0xFFF,
+                       0x40800100,0xFFF" />
+
+    <!--Rotation animation boost-->
+        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
+        <!-- GPU MIN_FREQUENCY resource opcode,value-->
+        <!-- Type="", Rotation animation boost -->
+
+        <Config
+            Id="0x00001090" Enable="true" Timeout="1000" Target="sdm660"
+            Resources="0x40800100, 1000, 0x4280C000, 596" />
+        <Config
+            Id="0x00001090" Enable="true" Timeout="1000" Target="sdm658"
+            Resources="0x40800100, 1000, 0x4280C000, 596" />
+        <Config
+            Id="0x00001090" Enable="true" Timeout="1000" Target="sdm630"
+            Resources="0x40800100, 1000, 0x4280C000, 596" />
+        <Config
+            Id="0x00001090" Enable="true" Timeout="1000" Target="sdm455"
+            Resources="0x40800100, 1000, 0x4280C000, 596" />
+
+    <!--Display on Resource -->
+        <!-- Display on resource opcode, value -->
+        <Config
+                Id="0x00001041" Enable="true" Timeout="0" Target="sdm660"
+                Resources="0x40000000, 1" />
+        <Config
+                Id="0x00001041" Enable="true" Timeout="0" Target="sdm658"
+                Resources="0x40000000, 1" />
+        <Config
+                Id="0x00001041" Enable="true" Timeout="0" Target="sdm630"
+                Resources="0x40000000, 1" />
+        <Config
+                Id="0x00001041" Enable="true" Timeout="0" Target="sdm455"
+                Resources="0x40000000, 1" />
+    <!--Display off Resource -->
+        <!-- Display on resource opcode, value -->
+        <Config
+                Id="0x00001040" Enable="true" Timeout="0" Target="sdm660"
+                Resources="0x40000000, 0x0" />
+        <Config
+                Id="0x00001040" Enable="true" Timeout="0" Target="sdm658"
+                Resources="0x40000000, 0x0" />
+        <Config
+                Id="0x00001040" Enable="true" Timeout="0" Target="sdm630"
+                Resources="0x40000000, 0x0" />
+        <Config
+                Id="0x00001040" Enable="true" Timeout="0" Target="sdm455"
+                Resources="0x40000000, 0x0" />
+
+    </PerfBoost>
+</BoostConfigs>
diff --git a/sdm660-common/proprietary/vendor/etc/perf/perfconfigstore.xml b/sdm660-common/proprietary/vendor/etc/perf/perfconfigstore.xml
new file mode 100644
index 0000000..140829d
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/perf/perfconfigstore.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2019 Qualcomm Technologies, Inc.
+ * All Rights Reserved.
+ * Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<!-- This is PerfConfigsStore file which returns the value when a
+particular property name is invoked -->
+
+<!-- This file supports only Prop tag, which has the following fields
+* Name, to identify the name of the property. The names of the
+properties have been classified into Vendor and System property.
+* Value, the new value to be returned as string when respective
+property Name is called. -->
+
+<PerfConfigsStore>
+    <PerfConfigs>
+
+                <!--Vendor Properties -->
+                <Prop Name="vendor.iop.enabled" Value="false" />
+                <Prop Name="vendor.iop.enable_uxe" Value="0" />
+                <Prop Name="vendor.perf.iop_v3.enable" Value="0" />
+                <Prop Name="vendor.perf.iop_v3.enable.debug" Value="0" />
+                <Prop Name="vendor.enable.prefetch" Value="0" />
+                <Prop Name="vendor.iop.enable_prefetch_ofr" Value="0" />
+
+                <!--System Properties -->
+                <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="60" />
+                <Prop Name="ro.vendor.at_library" Value="libqti-at.so" />
+                <Prop Name="ro.lmk.enable_userspace_lmk" Value="false" />
+                <Prop Name="vendor.perf.gestureflingboost.enable" Value="true" />
+
+                <Prop Name="ro.lmk.enable_userspace_lmk" Value="true" Kernel="4.19" />
+                <Prop Name="ro.lmk.kill_heaviest_task_dup" Value="true" Kernel="4.19" />
+                <Prop Name="ro.lmk.enhance_batch_kill" Value="false" Kernel="4.19" />
+                <Prop Name="ro.lmk.enable_watermark_check" Value="true" Kernel="4.19" />
+                <Prop Name="ro.lmk.use_new_strategy_dup" Value="true" Kernel="4.19" />
+                <Prop Name="ro.lmk.super_critical" Value="606" Kernel="4.19" />
+                <Prop Name="ro.lmk.direct_reclaim_pressure" Value="45" Kernel="4.19" />
+
+    </PerfConfigs>
+</PerfConfigsStore>
diff --git a/sdm660-common/proprietary/vendor/etc/perf/targetconfig.xml b/sdm660-common/proprietary/vendor/etc/perf/targetconfig.xml
new file mode 100644
index 0000000..46efa03
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/perf/targetconfig.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
+ * All Rights Reserved.
+ * Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<TargetConfig>
+
+    <!-- All the target related information goes in TargetInfo tag.
+    Following are the supported fields for  TargetInfo tag.
+        Mandatory Fields
+        * NumClusters, number of clusters
+        * TotalNumCores, total number of cores
+        * SocIds, a comma seperated list of supported socids for this target.
+        Other Fields
+        * Target, target name.
+        * SynCore, default value is "1" implies sync core and change to "0" for async core.
+        * CoreCtlCpu, core_ctl is enabled on which physical core, defalut value is "-1".
+        * MinCoreOnline, minimum number of cores needed to be online, default value is "0"
+        * GovInstanceType, default value "0" which implies "CLUSTER_BASED_GOV_INSTANCE",
+          can be changed to "1" for "SINGLE_GOV_INSTANCE".
+        * CpufreqGov, default value is "0" which implies "INTERACTIVE", can be changed it
+          to "1" for "SCHEDUTIL".
+    -->
+
+    <!-- For each cluster,write a seperate ClustersInfo tag.
+        Following are the supported fields for ClustersInfo tag.
+        Mandatory Fields
+        * Id, cluster number starts with index 0.
+        * NumCores, total number of cores for that cluster.
+        Other Fields
+        * Type, whther a "little" or "big" cluster.
+        (Type is mandatory, If there is more than one cluster.)
+        * MaxFrequency, Any limitations for max frequency for that cluster.
+    -->
+
+    <!-- For targets sharing the same platfrom, we can have seperate config tag for each
+         of those targets with different number in the Config tag and basing on the socId
+         of the target device, we decide which configs to consider. -->
+
+    <Config1>
+
+         <TargetInfo
+             Target="sdm660"
+             NumClusters="2"
+             TotalNumCores="8"
+             SocIds="317,324,345,346"
+             SynCore="1"
+             CoreCtlCpu="4"
+             MinCoreOnline="0" />
+
+         <ClustersInfo Id="0" NumCores="4" Type="little" />
+         <ClustersInfo Id="1" NumCores="4" Type="big" />
+
+    </Config1>
+
+    <Config2>
+
+         <TargetInfo
+             Target="sdm630"
+             NumClusters="2"
+             TotalNumCores="8"
+             SocIds="318,327"
+             SynCore="1"
+             MinCoreOnline="0" />
+
+         <ClustersInfo Id="0" NumCores="4" Type="big" />
+         <ClustersInfo Id="1" NumCores="4" Type="little" />
+
+    </Config2>
+
+    <Config3>
+         <TargetInfo
+             Target="sdm658"
+             NumClusters="2"
+             TotalNumCores="6"
+             SocIds="325,326"
+             SynCore="1"
+             CoreCtlCpu="4"
+             MinCoreOnline="0" />
+
+         <ClustersInfo Id="0" NumCores="2" Type="little" />
+         <ClustersInfo Id="1" NumCores="4" Type="big" />
+
+    </Config3>
+
+    <Config4>
+         <TargetInfo
+             Target="sdm455"
+             NumClusters="2"
+             TotalNumCores="8"
+             SocIds="385"
+             SynCore="1"
+             MinCoreOnline="0" />
+
+         <ClustersInfo Id="0" NumCores="4" Type="big" />
+         <ClustersInfo Id="1" NumCores="4" Type="little" />
+
+    </Config4>
+
+</TargetConfig>
diff --git a/sdm660-common/proprietary/vendor/etc/perf/targetresourceconfigs.xml b/sdm660-common/proprietary/vendor/etc/perf/targetresourceconfigs.xml
new file mode 100644
index 0000000..50cd272
--- /dev/null
+++ b/sdm660-common/proprietary/vendor/etc/perf/targetresourceconfigs.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Copyright (c) 2017-2018 Qualcomm Technologies, Inc.
+ * All Rights Reserved.
+ * Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<!-- This is a target specific resource config file which can be
+used to overwrite the node paths mentioned in common resources file
+and also to mention the resources which are not supported. -->
+
+<!-- This file supports only Config tag, which has the following fields
+* MajorValue and MinorValue, both are required to uniquely
+identify the resource.
+* Node, the new node path to overwrite the already existing one
+of commonresourceconfigs.xml file.
+* Supported, to indicate whether the resource is supported or not.
+* For each config tag, either of Node or Supported fields need
+to be mentioned. -->
+
+<!-- NOTE - It is not Mandatory to write all the resources which are not supported
+as anyway perflock calls of these resources would fail. -->
+
+<ResourceConfigs>
+    <PerfResources>
+
+        <Config MajorValue="0x1" MinorValue="0x2" Kernel="4.4" Supported="no" /> <!-- lpm_bias_hyst -->
+
+        <Config MajorValue="0x1" MinorValue="0x1" Kernel="4.14" Supported="no" /> <!-- perf-l2-pc/idle_enabled -->
+        <Config MajorValue="0x1" MinorValue="0x3" Kernel="4.14" Supported="no" /> <!-- ref_stddev -->
+        <Config MajorValue="0x1" MinorValue="0x4" Kernel="4.14" Supported="no" /> <!-- tmr_add -->
+
+        <Config MajorValue="0x1" MinorValue="0x2" Kernel="4.19" Supported="no" /> <!-- lpm_bias_hyst -->
+        <Config MajorValue="0x1" MinorValue="0x3" Kernel="4.19" Supported="no" /> <!-- lpm_ref_stddev -->
+        <Config MajorValue="0x1" MinorValue="0x4" Kernel="4.19" Supported="no" /> <!-- lpm_tmr_add -->
+
+        <Config MajorValue="0x3" MinorValue="0x2" Kernel="4.14" Supported="no" /> <!-- sched_migration_cost_ns -->
+        <Config MajorValue="0x3" MinorValue="0x3" Supported="no" /> <!-- sched_small_task -->
+        <Config MajorValue="0x3" MinorValue="0x6" Kernel="4.14" Supported="no" /> <!-- sched_init_task_load -->
+        <Config MajorValue="0x3" MinorValue="0xB" Kernel="4.14" Supported="no" /> <!-- sched_spill_nr_run -->
+        <Config MajorValue="0x3" MinorValue="0xC" Kernel="4.14" Supported="no" /> <!-- sched_static_cpu_pwr_cost -->
+        <Config MajorValue="0x3" MinorValue="0xD" Kernel="4.14" Supported="no" /> <!-- sched_restrict_cluster_spill -->
+        <Config MajorValue="0x3" MinorValue="0x13" Kernel="4.14" Supported="no" /> <!-- sched_freq_aggregate -->
+        <Config MajorValue="0x3" MinorValue="0x14" Kernel="4.14" Supported="no" /> <!-- sched_enable_thread_grouping -->
+        <Config MajorValue="0x3" MinorValue="0x17" Kernel="4.14" Supported="no" /> <!-- sched_freq_aggregate_threshold -->
+        <Config MajorValue="0x3" MinorValue="0x19" Kernel="4.14" Supported="no" /> <!-- sched_initial_task_util -->
+        <Config MajorValue="0x3" MinorValue="0x21" Kernel="4.14" Supported="no" /> <!-- sched_user_hint -->
+        <Config MajorValue="0x3" MinorValue="0x22" Kernel="4.14" Supported="no" /> <!-- sched_task_unfilter_nr_windows -->
+        <Config MajorValue="0x3" MinorValue="0x23" Kernel="4.14" Supported="no" /> <!-- sched_coloc_downmigrate_ns -->
+        <Config MajorValue="0x3" MinorValue="0x24" Kernel="4.14" Supported="no" /> <!-- sched_coloc_busy_hysteresis_enable_cpus -->
+        <Config MajorValue="0x3" MinorValue="0x25" Kernel="4.14" Supported="no" /> <!-- sched_coloc_busy_hyst_ns -->
+        <Config MajorValue="0x3" MinorValue="0x26" Kernel="4.14" Supported="no" /> <!-- sched_window_stats_policy -->
+        <Config MajorValue="0x3" MinorValue="0x29" Kernel="4.14" Supported="no" /> <!-- sched_ravg_window_nr_ticks -->
+
+        <Config MajorValue="0x3" MinorValue="0x6" Kernel="4.19" Supported="no" /> <!-- sched_init_task_load -->
+        <Config MajorValue="0x3" MinorValue="0xB" Kernel="4.19" Supported="no" /> <!-- sched_spill_nr_run -->
+        <Config MajorValue="0x3" MinorValue="0xC" Kernel="4.19" Supported="no" /> <!-- sched_static_cpu_pwr_cost -->
+        <Config MajorValue="0x3" MinorValue="0xD" Kernel="4.19" Supported="no" /> <!-- sched_restrict_cluster_spill -->
+        <Config MajorValue="0x3" MinorValue="0x13" Kernel="4.19" Supported="no" /> <!-- sched_set_freq_aggr -->
+        <Config MajorValue="0x3" MinorValue="0x14" Kernel="4.19" Supported="no" /> <!-- sched_enable_thread_grouping -->
+        <Config MajorValue="0x3" MinorValue="0x17" Kernel="4.19" Supported="no" /> <!-- sched_freq_aggr_threshold -->
+        <Config MajorValue="0x3" MinorValue="0x19" Kernel="4.19" Supported="no" /> <!-- sched_initial_task_util -->
+        <Config MajorValue="0x3" MinorValue="0x21" Kernel="4.19" Supported="no" /> <!-- sched_user_hint -->
+        <Config MajorValue="0x3" MinorValue="0x22" Kernel="4.19" Supported="no" /> <!-- sched_task_unfilter_nr_windows -->
+
+        <!-- For INTERACTIVE major, all the interactive minors are not supported by default as the recent target moved to schedutil.
+        So, for older targets where interactive minors are supported they need to be enabled and schedutil minors are disabled. -->
+        <Config MajorValue="0x5" MinorValue="0x0" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x1" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x3" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x4" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x5" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x6" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x7" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x8" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x9" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0xA" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0xB" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0xC" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0xD" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0xE" Kernel="4.4" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0xF" Kernel="4.4" Supported="no" />
+        <Config MajorValue="0x5" MinorValue="0x10" Kernel="4.4" Supported="no" />
+        <Config MajorValue="0x5" MinorValue="0x11" Kernel="4.4" Supported="no" />
+        <Config MajorValue="0x5" MinorValue="0x12" Kernel="4.4" Supported="no" />
+
+        <Config MajorValue="0x5" MinorValue="0xF" Kernel="4.14" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x10" Kernel="4.14" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x11" Kernel="4.14" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x12" Kernel="4.14" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x13" Supported="no" />
+
+        <Config MajorValue="0x5" MinorValue="0xF" Kernel="4.19" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x10" Kernel="4.19" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x11" Kernel="4.19" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x12" Kernel="4.19" Supported="yes" />
+        <Config MajorValue="0x5" MinorValue="0x13" Kernel="4.19" Supported="yes" />
+        <!--All the cpubw_hwmon path are now migrated to new opcodes. Hence unsupporting old ones-->
+        <Config MajorValue="0x6" MinorValue="0x0" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x1" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x2" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x3" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x4" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x5" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x6" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x7" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x8" Kernel="4.19" Supported="no" />
+        <Config MajorValue="0x6" MinorValue="0x9" Kernel="4.19" Supported="no" />
+
+        <Config MajorValue="0xB" MinorValue="0x2" Kernel="4.19" Node="/sys/devices/system/cpu/cpu_boost/input_boost_freq" /> <!-- input_boost_freq on kernel 4.19 -->
+
+        <!-- All the minors of LLCBW_HWMON MAJOR are not supported -->
+        <Config MajorValue="0xC" MinorValue="0x0" Supported="no" />
+        <Config MajorValue="0xC" MinorValue="0x1" Supported="no" />
+        <Config MajorValue="0xC" MinorValue="0x2" Supported="no" />
+        <Config MajorValue="0xC" MinorValue="0x3" Supported="no" />
+
+        <Config MajorValue="0xC" MinorValue="0xA" Kernel="4.19" Supported="no" /> <!-- cpubw_hmon_low_power_ceil_mbps -->
+        <Config MajorValue="0xC" MinorValue="0xB" Kernel="4.19" Supported="no" /> <!-- cpubw_hmon_low_power_io_percent -->
+
+        <Config MajorValue="0xD" MinorValue="0x0" Supported="no" /> <!--  l3_min_freq -->
+
+    </PerfResources>
+</ResourceConfigs>
diff --git a/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy b/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
index 38dc4c9..3ed54f6 100644
--- a/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
+++ b/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
@@ -92,4 +92,4 @@ sched_getaffinity: 1
 socket: 1
 process_vm_readv: 1
 tgkill: 1
-sigreturn: 1
+
diff --git a/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy b/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy
index 1814701..2222edb 100644
--- a/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy
+++ b/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy
@@ -78,4 +78,3 @@ getdents64: 1
 getsockname: 1
 recvfrom: 1
 madvise: 1
-gettimeofday: 1
diff --git a/sdm660-common/proprietary/vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so b/sdm660-common/proprietary/vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so
index e355092..f187b50 100644
Binary files a/sdm660-common/proprietary/vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so and b/sdm660-common/proprietary/vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.so b/sdm660-common/proprietary/vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.so
index b66de83..db66515 100644
Binary files a/sdm660-common/proprietary/vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.so and b/sdm660-common/proprietary/vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.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
old mode 100644
new mode 100755
index 935ed35..5bc0207
Binary files a/sdm660-common/proprietary/vendor/lib/hw/com.dsi.ant@1.0-impl.so 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.hardware.qseecom@1.0-impl.so b/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so
old mode 100644
new mode 100755
index 84df4f9..87c8c64
Binary files a/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so 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
old mode 100644
new mode 100755
index 08f5846..7a2adf2
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/hw/vulkan.adreno.so b/sdm660-common/proprietary/vendor/lib/hw/vulkan.adreno.so
old mode 100644
new mode 100755
index 9c82f4d..2dd2e60
Binary files a/sdm660-common/proprietary/vendor/lib/hw/vulkan.adreno.so and b/sdm660-common/proprietary/vendor/lib/hw/vulkan.adreno.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libFlacSwDec.so b/sdm660-common/proprietary/vendor/lib/libFlacSwDec.so
new file mode 100755
index 0000000..0f35faf
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libFlacSwDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxApeDecSw.so b/sdm660-common/proprietary/vendor/lib/libOmxApeDecSw.so
new file mode 100755
index 0000000..af99da3
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxApeDecSw.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOpenCL.so b/sdm660-common/proprietary/vendor/lib/libOpenCL.so
old mode 100644
new mode 100755
index 9d8ca0c..cdfdb40
Binary files a/sdm660-common/proprietary/vendor/lib/libOpenCL.so and b/sdm660-common/proprietary/vendor/lib/libOpenCL.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libQSEEComAPI.so b/sdm660-common/proprietary/vendor/lib/libQSEEComAPI.so
old mode 100644
new mode 100755
index 1c88614..eda2d22
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
old mode 100644
new mode 100755
index 4bc04f0..315358e
Binary files a/sdm660-common/proprietary/vendor/lib/libQTEEConnector_vendor.so and b/sdm660-common/proprietary/vendor/lib/libQTEEConnector_vendor.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libVkLayer_q3dtools.so b/sdm660-common/proprietary/vendor/lib/libVkLayer_q3dtools.so
old mode 100644
new mode 100755
index 5d3dcde..4ffdd7f
Binary files a/sdm660-common/proprietary/vendor/lib/libVkLayer_q3dtools.so and b/sdm660-common/proprietary/vendor/lib/libVkLayer_q3dtools.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libdapparamstorage.so b/sdm660-common/proprietary/vendor/lib/libdapparamstorage.so
deleted file mode 100644
index 2cde023..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libdapparamstorage.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libdeccfg.so b/sdm660-common/proprietary/vendor/lib/libdeccfg.so
deleted file mode 100644
index da3a79b..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libdeccfg.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libdiag.so b/sdm660-common/proprietary/vendor/lib/libdiag.so
old mode 100644
new mode 100755
index e4a8981..d135cac
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/libgcs-calwrapper.so b/sdm660-common/proprietary/vendor/lib/libgcs-calwrapper.so
old mode 100644
new mode 100755
index 3c78811..26e3fde
Binary files a/sdm660-common/proprietary/vendor/lib/libgcs-calwrapper.so and b/sdm660-common/proprietary/vendor/lib/libgcs-calwrapper.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libgcs-ipc.so b/sdm660-common/proprietary/vendor/lib/libgcs-ipc.so
old mode 100644
new mode 100755
index cb0792b..f104d4b
Binary files a/sdm660-common/proprietary/vendor/lib/libgcs-ipc.so and b/sdm660-common/proprietary/vendor/lib/libgcs-ipc.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libgcs-osal.so b/sdm660-common/proprietary/vendor/lib/libgcs-osal.so
old mode 100644
new mode 100755
index 0d217a2..44e09e5
Binary files a/sdm660-common/proprietary/vendor/lib/libgcs-osal.so and b/sdm660-common/proprietary/vendor/lib/libgcs-osal.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libgcs.so b/sdm660-common/proprietary/vendor/lib/libgcs.so
old mode 100644
new mode 100755
index 4d39066..9385dd9
Binary files a/sdm660-common/proprietary/vendor/lib/libgcs.so and b/sdm660-common/proprietary/vendor/lib/libgcs.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libidl.so b/sdm660-common/proprietary/vendor/lib/libidl.so
old mode 100644
new mode 100755
index a66b8b1..e39b492
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/libkeymasterdeviceutils.so b/sdm660-common/proprietary/vendor/lib/libkeymasterdeviceutils.so
index 12ba527..c81be39 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libkeymasterdeviceutils.so and b/sdm660-common/proprietary/vendor/lib/libkeymasterdeviceutils.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libkeymasterprovision.so b/sdm660-common/proprietary/vendor/lib/libkeymasterprovision.so
index 0e7af75..6e5e916 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libkeymasterprovision.so and b/sdm660-common/proprietary/vendor/lib/libkeymasterprovision.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libkeymasterutils.so b/sdm660-common/proprietary/vendor/lib/libkeymasterutils.so
index 301c9d2..d39eaa4 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libkeymasterutils.so and b/sdm660-common/proprietary/vendor/lib/libkeymasterutils.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libperfconfig.so b/sdm660-common/proprietary/vendor/lib/libperfconfig.so
new file mode 100755
index 0000000..f6eb992
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libperfconfig.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libperfgluelayer.so b/sdm660-common/proprietary/vendor/lib/libperfgluelayer.so
new file mode 100755
index 0000000..f461c79
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libperfgluelayer.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqmi_cci.so b/sdm660-common/proprietary/vendor/lib/libqmi_cci.so
old mode 100644
new mode 100755
index d5e7970..1d8d77d
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_common_so.so b/sdm660-common/proprietary/vendor/lib/libqmi_common_so.so
old mode 100644
new mode 100755
index 757ce2b..44fe5ee
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_encdec.so b/sdm660-common/proprietary/vendor/lib/libqmi_encdec.so
old mode 100644
new mode 100755
index 7ccb907..0bab23f
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/libqmiservices.so b/sdm660-common/proprietary/vendor/lib/libqmiservices.so
old mode 100644
new mode 100755
index ab2d535..5defc27
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/libqti-perfd-client.so b/sdm660-common/proprietary/vendor/lib/libqti-perfd-client.so
new file mode 100755
index 0000000..6f94c8d
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libqti-perfd-client.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqti-perfd.so b/sdm660-common/proprietary/vendor/lib/libqti-perfd.so
new file mode 100755
index 0000000..f16147b
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libqti-perfd.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqti-util.so b/sdm660-common/proprietary/vendor/lib/libqti-util.so
new file mode 100755
index 0000000..8adc395
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libqti-util.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libsensor1.so b/sdm660-common/proprietary/vendor/lib/libsensor1.so
index bdadc5e..dfa5e11 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libsensor1.so and b/sdm660-common/proprietary/vendor/lib/libsensor1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libsensor_reg.so b/sdm660-common/proprietary/vendor/lib/libsensor_reg.so
index 6cd3be9..678c775 100644
Binary files a/sdm660-common/proprietary/vendor/lib/libsensor_reg.so and b/sdm660-common/proprietary/vendor/lib/libsensor_reg.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libsmwrapper.so b/sdm660-common/proprietary/vendor/lib/libsmwrapper.so
old mode 100644
new mode 100755
index f0e9d26..be453b8
Binary files a/sdm660-common/proprietary/vendor/lib/libsmwrapper.so and b/sdm660-common/proprietary/vendor/lib/libsmwrapper.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ac4dec.so b/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ac4dec.so
deleted file mode 100644
index c1a648c..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ac4dec.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ddpdec.so b/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ddpdec.so
deleted file mode 100644
index 4d0f934..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ddpdec.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libstagefrightdolby.so b/sdm660-common/proprietary/vendor/lib/libstagefrightdolby.so
deleted file mode 100644
index 55e9433..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libstagefrightdolby.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/libsubsystem_control.so b/sdm660-common/proprietary/vendor/lib/libsubsystem_control.so
old mode 100644
new mode 100755
index 8cf126b..57b19b4
Binary files a/sdm660-common/proprietary/vendor/lib/libsubsystem_control.so and b/sdm660-common/proprietary/vendor/lib/libsubsystem_control.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libsysmon_cdsp_skel.so b/sdm660-common/proprietary/vendor/lib/libsysmon_cdsp_skel.so
old mode 100644
new mode 100755
index c515ef4..6649442
Binary files a/sdm660-common/proprietary/vendor/lib/libsysmon_cdsp_skel.so and b/sdm660-common/proprietary/vendor/lib/libsysmon_cdsp_skel.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libthermalclient.so b/sdm660-common/proprietary/vendor/lib/libthermalclient.so
old mode 100644
new mode 100755
index e29a32c..8367b62
Binary files a/sdm660-common/proprietary/vendor/lib/libthermalclient.so and b/sdm660-common/proprietary/vendor/lib/libthermalclient.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/sensors.ssc.so b/sdm660-common/proprietary/vendor/lib/sensors.ssc.so
index f8f505d..ede5480 100644
Binary files a/sdm660-common/proprietary/vendor/lib/sensors.ssc.so and b/sdm660-common/proprietary/vendor/lib/sensors.ssc.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/soundfx/libswdap.so b/sdm660-common/proprietary/vendor/lib/soundfx/libswdap.so
deleted file mode 100644
index 16dcb03..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/soundfx/libswdap.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/soundfx/libswgamedap.so b/sdm660-common/proprietary/vendor/lib/soundfx/libswgamedap.so
deleted file mode 100644
index 5a00e1e..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/soundfx/libswgamedap.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/soundfx/libswvqe.so b/sdm660-common/proprietary/vendor/lib/soundfx/libswvqe.so
deleted file mode 100644
index 4f4de5b..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/soundfx/libswvqe.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/vendor.dolby.hardware.dms@2.0.so b/sdm660-common/proprietary/vendor/lib/vendor.dolby.hardware.dms@2.0.so
deleted file mode 100644
index fd73e9b..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/vendor.dolby.hardware.dms@2.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so b/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so
old mode 100644
new mode 100755
index bd436be..925bc78
Binary files a/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so and b/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.dsp@1.0.so 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
old mode 100644
new mode 100755
index 808ca27..4306cd8
Binary files a/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so 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
old mode 100644
new mode 100755
index 585a5cb..98e70bf
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
old mode 100644
new mode 100755
index e7eb745..d1dc209
Binary files a/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.tui_comm@1.0.so 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.dpm.api@1.0.so b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so
index a0de852..2447fcf 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
old mode 100644
new mode 100755
index ae1a3b9..41a728d
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
old mode 100644
new mode 100755
index 7b3a4eb..5a872af
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
old mode 100644
new mode 100755
index d0c5ffe..9490316
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
old mode 100644
new mode 100755
index ec04ec9..4154f18
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
old mode 100644
new mode 100755
index 6ea9180..463e283
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
old mode 100644
new mode 100755
index d45f3f0..5637d8d
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
old mode 100644
new mode 100755
index 60f2405..9d97fb6
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
old mode 100644
new mode 100755
index a592744..bbd3712
Binary files a/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so and b/sdm660-common/proprietary/vendor/lib64/com.qualcomm.qti.uceservice@2.3.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so b/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
old mode 100644
new mode 100755
index fb4d399..2153a0e
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so and b/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so b/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so
index 38c3c87..a1d7cf8 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so and b/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.keymaster@3.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
old mode 100644
new mode 100755
index 552c1a8..8452e82
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so 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/vendor.qti.gnss@4.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so
old mode 100644
new mode 100755
index bf5957d..3d3a4bc
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so and b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-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
old mode 100644
new mode 100755
index f6b4c4a..b36de89
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.fm@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
old mode 100644
new mode 100755
index a3964c7..a2ebeac
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
old mode 100644
new mode 100755
index 27c508d..beac141
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so 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
old mode 100644
new mode 100755
index 061dcd1..466fd01
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so 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
old mode 100644
new mode 100755
index 2b3cf01..f292505
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
old mode 100644
new mode 100755
index f20126e..f5b1168
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/hw/vulkan.adreno.so b/sdm660-common/proprietary/vendor/lib64/hw/vulkan.adreno.so
old mode 100644
new mode 100755
index e8c0761..2a960b4
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vulkan.adreno.so and b/sdm660-common/proprietary/vendor/lib64/hw/vulkan.adreno.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/lib-imscmservice.so b/sdm660-common/proprietary/vendor/lib64/lib-imscmservice.so
old mode 100644
new mode 100755
index 2eea16e..aed48e8
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
old mode 100644
new mode 100755
index 0130eaa..e1a8e62
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
old mode 100644
new mode 100755
index 32742e3..e58fbea
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
old mode 100644
new mode 100755
index 9f4785a..53b9930
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
old mode 100644
new mode 100755
index 45385f8..8591cc2
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
old mode 100644
new mode 100755
index 67d2e3d..3a68336
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
old mode 100644
new mode 100755
index 36c76eb..92256d0
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
old mode 100644
new mode 100755
index b2206b2..e44a088
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
old mode 100644
new mode 100755
index b3f1857..a1d4ea2
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
old mode 100644
new mode 100755
index 77bf73f..d6a8b5d
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
old mode 100644
new mode 100755
index 44692f8..3896b33
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
old mode 100644
new mode 100755
index f496001..9c652a0
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
old mode 100644
new mode 100755
index 8030f0e..c056b09
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/libFlacSwDec.so b/sdm660-common/proprietary/vendor/lib64/libFlacSwDec.so
new file mode 100755
index 0000000..022e242
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libFlacSwDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libGPreqcancel.so b/sdm660-common/proprietary/vendor/lib64/libGPreqcancel.so
old mode 100644
new mode 100755
index fbf8756..647b1e8
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
old mode 100644
new mode 100755
index 5b51148..9dda51c
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/libOmxApeDecSw.so b/sdm660-common/proprietary/vendor/lib64/libOmxApeDecSw.so
new file mode 100755
index 0000000..c33141b
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libOmxApeDecSw.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libOpenCL.so b/sdm660-common/proprietary/vendor/lib64/libOpenCL.so
old mode 100644
new mode 100755
index 6881dcf..19e7753
Binary files a/sdm660-common/proprietary/vendor/lib64/libOpenCL.so and b/sdm660-common/proprietary/vendor/lib64/libOpenCL.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libQSEEComAPI.so b/sdm660-common/proprietary/vendor/lib64/libQSEEComAPI.so
old mode 100644
new mode 100755
index 7d2cedb..777a604
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
old mode 100644
new mode 100755
index b00dac2..eb37e21
Binary files a/sdm660-common/proprietary/vendor/lib64/libQTEEConnector_vendor.so 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
old mode 100644
new mode 100755
index 331f8e2..1ba0542
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
old mode 100644
new mode 100755
index 20ea348..a894540
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/libVkLayer_q3dtools.so b/sdm660-common/proprietary/vendor/lib64/libVkLayer_q3dtools.so
old mode 100644
new mode 100755
index c97b894..a42c473
Binary files a/sdm660-common/proprietary/vendor/lib64/libVkLayer_q3dtools.so and b/sdm660-common/proprietary/vendor/lib64/libVkLayer_q3dtools.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libasn1cper.so b/sdm660-common/proprietary/vendor/lib64/libasn1cper.so
old mode 100644
new mode 100755
index 52e68fe..d958bf7
Binary files a/sdm660-common/proprietary/vendor/lib64/libasn1cper.so and b/sdm660-common/proprietary/vendor/lib64/libasn1cper.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libasn1crt.so b/sdm660-common/proprietary/vendor/lib64/libasn1crt.so
old mode 100644
new mode 100755
index e6a65df..6df147d
Binary files a/sdm660-common/proprietary/vendor/lib64/libasn1crt.so and b/sdm660-common/proprietary/vendor/lib64/libasn1crt.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libasn1crtx.so b/sdm660-common/proprietary/vendor/lib64/libasn1crtx.so
old mode 100644
new mode 100755
index 249c974..479aa52
Binary files a/sdm660-common/proprietary/vendor/lib64/libasn1crtx.so and b/sdm660-common/proprietary/vendor/lib64/libasn1crtx.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libbase64.so b/sdm660-common/proprietary/vendor/lib64/libbase64.so
old mode 100644
new mode 100755
index 53e64dd..f8aa760
Binary files a/sdm660-common/proprietary/vendor/lib64/libbase64.so and b/sdm660-common/proprietary/vendor/lib64/libbase64.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcacertclient.so b/sdm660-common/proprietary/vendor/lib64/libcacertclient.so
old mode 100644
new mode 100755
index b37baeb..685ee8a
Binary files a/sdm660-common/proprietary/vendor/lib64/libcacertclient.so and b/sdm660-common/proprietary/vendor/lib64/libcacertclient.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcdfw.so b/sdm660-common/proprietary/vendor/lib64/libcdfw.so
old mode 100644
new mode 100755
index 777374a..870011f
Binary files a/sdm660-common/proprietary/vendor/lib64/libcdfw.so and b/sdm660-common/proprietary/vendor/lib64/libcdfw.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcdfw_remote_api.so b/sdm660-common/proprietary/vendor/lib64/libcdfw_remote_api.so
old mode 100644
new mode 100755
index a184a61..0d25ca2
Binary files a/sdm660-common/proprietary/vendor/lib64/libcdfw_remote_api.so and b/sdm660-common/proprietary/vendor/lib64/libcdfw_remote_api.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcdsp_default_listener.so b/sdm660-common/proprietary/vendor/lib64/libcdsp_default_listener.so
old mode 100644
new mode 100755
index 3a64b30..005d82c
Binary files a/sdm660-common/proprietary/vendor/lib64/libcdsp_default_listener.so and b/sdm660-common/proprietary/vendor/lib64/libcdsp_default_listener.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libcne.so b/sdm660-common/proprietary/vendor/lib64/libcne.so
old mode 100644
new mode 100755
index a2411b1..0af28ea
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
old mode 100644
new mode 100755
index 3cf69cf..32796bf
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
old mode 100644
new mode 100755
index 62ce213..16c0977
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
old mode 100644
new mode 100755
index a9aedcc..a57498d
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
old mode 100644
new mode 100755
index 4fdb849..1dab8b8
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/libcpion.so b/sdm660-common/proprietary/vendor/lib64/libcpion.so
old mode 100644
new mode 100755
index fca4363..300e363
Binary files a/sdm660-common/proprietary/vendor/lib64/libcpion.so and b/sdm660-common/proprietary/vendor/lib64/libcpion.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdapparamstorage.so b/sdm660-common/proprietary/vendor/lib64/libdapparamstorage.so
deleted file mode 100644
index 548dd74..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/libdapparamstorage.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdataitems.so b/sdm660-common/proprietary/vendor/lib64/libdataitems.so
old mode 100644
new mode 100755
index b0cc79f..d302e56
Binary files a/sdm660-common/proprietary/vendor/lib64/libdataitems.so and b/sdm660-common/proprietary/vendor/lib64/libdataitems.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdiag.so b/sdm660-common/proprietary/vendor/lib64/libdiag.so
old mode 100644
new mode 100755
index 6f1dade..1885e8e
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/libdlbdsservice.so b/sdm660-common/proprietary/vendor/lib64/libdlbdsservice.so
deleted file mode 100644
index 314536b..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/libdlbdsservice.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libdpmqmihal.so b/sdm660-common/proprietary/vendor/lib64/libdpmqmihal.so
index 7915592..2434e92 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
old mode 100644
new mode 100755
index 3926688..af5e980
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
old mode 100644
new mode 100755
index 33e1f73..0e4c84d
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
old mode 100644
new mode 100755
index 4702f27..7be4c66
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
old mode 100644
new mode 100755
index a9d1e37..3bf0d6a
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/libgarden.so b/sdm660-common/proprietary/vendor/lib64/libgarden.so
old mode 100644
new mode 100755
index 3c55028..0358e57
Binary files a/sdm660-common/proprietary/vendor/lib64/libgarden.so and b/sdm660-common/proprietary/vendor/lib64/libgarden.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libgarden_haltests_e2e.so b/sdm660-common/proprietary/vendor/lib64/libgarden_haltests_e2e.so
old mode 100644
new mode 100755
index 6376ab6..e171d71
Binary files a/sdm660-common/proprietary/vendor/lib64/libgarden_haltests_e2e.so and b/sdm660-common/proprietary/vendor/lib64/libgarden_haltests_e2e.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libgdtap.so b/sdm660-common/proprietary/vendor/lib64/libgdtap.so
old mode 100644
new mode 100755
index ce44e68..f320146
Binary files a/sdm660-common/proprietary/vendor/lib64/libgdtap.so and b/sdm660-common/proprietary/vendor/lib64/libgdtap.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libgnsspps.so b/sdm660-common/proprietary/vendor/lib64/libgnsspps.so
old mode 100644
new mode 100755
index bbd947c..b06655a
Binary files a/sdm660-common/proprietary/vendor/lib64/libgnsspps.so and b/sdm660-common/proprietary/vendor/lib64/libgnsspps.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libhdcpsrm.so b/sdm660-common/proprietary/vendor/lib64/libhdcpsrm.so
old mode 100644
new mode 100755
index 69ce052..1c40920
Binary files a/sdm660-common/proprietary/vendor/lib64/libhdcpsrm.so and b/sdm660-common/proprietary/vendor/lib64/libhdcpsrm.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libidl.so b/sdm660-common/proprietary/vendor/lib64/libidl.so
old mode 100644
new mode 100755
index 8ccadb9..1027ea1
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/libizat_client_api.so b/sdm660-common/proprietary/vendor/lib64/libizat_client_api.so
old mode 100644
new mode 100755
index 00a309f..8e9c41a
Binary files a/sdm660-common/proprietary/vendor/lib64/libizat_client_api.so and b/sdm660-common/proprietary/vendor/lib64/libizat_client_api.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libizat_core.so b/sdm660-common/proprietary/vendor/lib64/libizat_core.so
old mode 100644
new mode 100755
index 8c89163..8b5908e
Binary files a/sdm660-common/proprietary/vendor/lib64/libizat_core.so and b/sdm660-common/proprietary/vendor/lib64/libizat_core.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libjnihelper.so b/sdm660-common/proprietary/vendor/lib64/libjnihelper.so
old mode 100644
new mode 100755
index 04c4231..d62ba54
Binary files a/sdm660-common/proprietary/vendor/lib64/libjnihelper.so and b/sdm660-common/proprietary/vendor/lib64/libjnihelper.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libkeymasterdeviceutils.so b/sdm660-common/proprietary/vendor/lib64/libkeymasterdeviceutils.so
index 1124d27..3c07c38 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libkeymasterdeviceutils.so and b/sdm660-common/proprietary/vendor/lib64/libkeymasterdeviceutils.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libkeymasterprovision.so b/sdm660-common/proprietary/vendor/lib64/libkeymasterprovision.so
index 582d303..c8dd732 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libkeymasterprovision.so and b/sdm660-common/proprietary/vendor/lib64/libkeymasterprovision.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libkeymasterutils.so b/sdm660-common/proprietary/vendor/lib64/libkeymasterutils.so
index 2dc736a..5b9c5d3 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libkeymasterutils.so and b/sdm660-common/proprietary/vendor/lib64/libkeymasterutils.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblbs_core.so b/sdm660-common/proprietary/vendor/lib64/liblbs_core.so
old mode 100644
new mode 100755
index 02ed978..23477e5
Binary files a/sdm660-common/proprietary/vendor/lib64/liblbs_core.so and b/sdm660-common/proprietary/vendor/lib64/liblbs_core.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblistensoundmodel2.so b/sdm660-common/proprietary/vendor/lib64/liblistensoundmodel2.so
new file mode 100755
index 0000000..89c4135
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/liblistensoundmodel2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libloc_api_v02.so b/sdm660-common/proprietary/vendor/lib64/libloc_api_v02.so
old mode 100644
new mode 100755
index a7612aa..f00a9b4
Binary files a/sdm660-common/proprietary/vendor/lib64/libloc_api_v02.so and b/sdm660-common/proprietary/vendor/lib64/libloc_api_v02.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libloc_socket.so b/sdm660-common/proprietary/vendor/lib64/libloc_socket.so
old mode 100644
new mode 100755
index 61cea9a..644b970
Binary files a/sdm660-common/proprietary/vendor/lib64/libloc_socket.so and b/sdm660-common/proprietary/vendor/lib64/libloc_socket.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblocationservice.so b/sdm660-common/proprietary/vendor/lib64/liblocationservice.so
old mode 100644
new mode 100755
index 95dbeaa..0817e69
Binary files a/sdm660-common/proprietary/vendor/lib64/liblocationservice.so and b/sdm660-common/proprietary/vendor/lib64/liblocationservice.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblocationservice_glue.so b/sdm660-common/proprietary/vendor/lib64/liblocationservice_glue.so
old mode 100644
new mode 100755
index cb4efc9..aed2327
Binary files a/sdm660-common/proprietary/vendor/lib64/liblocationservice_glue.so and b/sdm660-common/proprietary/vendor/lib64/liblocationservice_glue.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblowi_client.so b/sdm660-common/proprietary/vendor/lib64/liblowi_client.so
old mode 100644
new mode 100755
index ad68859..d8a153d
Binary files a/sdm660-common/proprietary/vendor/lib64/liblowi_client.so and b/sdm660-common/proprietary/vendor/lib64/liblowi_client.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblowi_wifihal.so b/sdm660-common/proprietary/vendor/lib64/liblowi_wifihal.so
old mode 100644
new mode 100755
index cda712c..ef86603
Binary files a/sdm660-common/proprietary/vendor/lib64/liblowi_wifihal.so and b/sdm660-common/proprietary/vendor/lib64/liblowi_wifihal.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblqe.so b/sdm660-common/proprietary/vendor/lib64/liblqe.so
old mode 100644
new mode 100755
index 7f776df..54f333a
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
old mode 100644
new mode 100755
index dcd4627..a99df17
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
old mode 100644
new mode 100755
index 2b31939..d9f03b6
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/libminksocket.so b/sdm660-common/proprietary/vendor/lib64/libminksocket.so
old mode 100644
new mode 100755
index d39e740..6808906
Binary files a/sdm660-common/proprietary/vendor/lib64/libminksocket.so and b/sdm660-common/proprietary/vendor/lib64/libminksocket.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libmm-hdcpmgr.so b/sdm660-common/proprietary/vendor/lib64/libmm-hdcpmgr.so
old mode 100644
new mode 100755
index d5ca278..85e5787
Binary files a/sdm660-common/proprietary/vendor/lib64/libmm-hdcpmgr.so and b/sdm660-common/proprietary/vendor/lib64/libmm-hdcpmgr.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libmmosal.so b/sdm660-common/proprietary/vendor/lib64/libmmosal.so
old mode 100644
new mode 100755
index 4a3a66a..4d07656
Binary files a/sdm660-common/proprietary/vendor/lib64/libmmosal.so and b/sdm660-common/proprietary/vendor/lib64/libmmosal.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libnetmgr.so b/sdm660-common/proprietary/vendor/lib64/libnetmgr.so
old mode 100644
new mode 100755
index e989234..8b7ee46
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
old mode 100644
new mode 100755
index 60a4794..562d363
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
old mode 100644
new mode 100755
index 32ec72c..77df7ca
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
old mode 100644
new mode 100755
index f098120..a1d6cef
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
old mode 100644
new mode 100755
index efc2dab..23880ef
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/libpdmapper.so b/sdm660-common/proprietary/vendor/lib64/libpdmapper.so
old mode 100644
new mode 100755
index cc3d2dd..05b1afb
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
old mode 100644
new mode 100755
index 107bcf3..7bc9cf7
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/libperfconfig.so b/sdm660-common/proprietary/vendor/lib64/libperfconfig.so
new file mode 100755
index 0000000..52b1cb6
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libperfconfig.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libperfgluelayer.so b/sdm660-common/proprietary/vendor/lib64/libperfgluelayer.so
new file mode 100755
index 0000000..d3e711f
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libperfgluelayer.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libperipheral_client.so b/sdm660-common/proprietary/vendor/lib64/libperipheral_client.so
old mode 100644
new mode 100755
index 3e65e39..0cf0f3e
Binary files a/sdm660-common/proprietary/vendor/lib64/libperipheral_client.so and b/sdm660-common/proprietary/vendor/lib64/libperipheral_client.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcbor.so b/sdm660-common/proprietary/vendor/lib64/libqcbor.so
index 8f6ea59..ff28879 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libqcbor.so and b/sdm660-common/proprietary/vendor/lib64/libqcbor.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcc_file_agent.so b/sdm660-common/proprietary/vendor/lib64/libqcc_file_agent.so
old mode 100644
new mode 100755
index 967254a..bff94b8
Binary files a/sdm660-common/proprietary/vendor/lib64/libqcc_file_agent.so and b/sdm660-common/proprietary/vendor/lib64/libqcc_file_agent.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcci_legacy.so b/sdm660-common/proprietary/vendor/lib64/libqcci_legacy.so
old mode 100644
new mode 100755
index 5287a78..d02cfc5
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
old mode 100644
new mode 100755
index 39635c7..b0cdb77
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
old mode 100644
new mode 100755
index ffa2eeb..7daca60
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
old mode 100644
new mode 100755
index 983e546..43379cb
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
old mode 100644
new mode 100755
index f717fce..af31cf8
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/libqdp.so b/sdm660-common/proprietary/vendor/lib64/libqdp.so
old mode 100644
new mode 100755
index 0472a0f..be69945
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
old mode 100644
new mode 100755
index 443b7b1..e0edd58
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
old mode 100644
new mode 100755
index 8284000..2444b20
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
old mode 100644
new mode 100755
index ce8f62a..c1e6a84
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
old mode 100644
new mode 100755
index fa738b0..2ef6d03
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
old mode 100644
new mode 100755
index 0521959..c60eb4a
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
old mode 100644
new mode 100755
index 5782413..3949e92
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
old mode 100644
new mode 100755
index 231a4ba..8585c83
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_encdec.so b/sdm660-common/proprietary/vendor/lib64/libqmi_encdec.so
old mode 100644
new mode 100755
index 4f22a4f..0628fda
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
old mode 100644
new mode 100755
index 9da00bf..dc70e30
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/libqmiservices.so b/sdm660-common/proprietary/vendor/lib64/libqmiservices.so
old mode 100644
new mode 100755
index db71fe5..9a68596
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
old mode 100644
new mode 100755
index 1990260..5002584
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
old mode 100644
new mode 100755
index c858835..1fcb063
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/libqti-perfd-client.so b/sdm660-common/proprietary/vendor/lib64/libqti-perfd-client.so
new file mode 100755
index 0000000..0bf7579
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libqti-perfd-client.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqti-perfd.so b/sdm660-common/proprietary/vendor/lib64/libqti-perfd.so
new file mode 100755
index 0000000..d4ebfc9
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libqti-perfd.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqti-util.so b/sdm660-common/proprietary/vendor/lib64/libqti-util.so
new file mode 100755
index 0000000..a49ae51
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib64/libqti-util.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/librcc.so b/sdm660-common/proprietary/vendor/lib64/librcc.so
old mode 100644
new mode 100755
index 5a39f20..64689d4
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
old mode 100644
new mode 100755
index a774419..5fb09d2
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
old mode 100644
new mode 100755
index f3c3211..bc0343d
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/librilqmiservices.so b/sdm660-common/proprietary/vendor/lib64/librilqmiservices.so
old mode 100644
new mode 100755
index aee1c8e..62f64e4
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
old mode 100644
new mode 100755
index eee3fd9..2f03215
Binary files a/sdm660-common/proprietary/vendor/lib64/librmp.so 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
old mode 100644
new mode 100755
index 8ff5e4d..e6dbba3
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
old mode 100644
new mode 100755
index 4db5a9c..6309053
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
old mode 100644
new mode 100755
index d551c7b..940e955
Binary files a/sdm660-common/proprietary/vendor/lib64/libsecureui.so 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
old mode 100644
new mode 100755
index bef7931..f4e18f0
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/libsensor1.so b/sdm660-common/proprietary/vendor/lib64/libsensor1.so
index 14e84ed..da11ec9 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libsensor1.so and b/sdm660-common/proprietary/vendor/lib64/libsensor1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsensor_reg.so b/sdm660-common/proprietary/vendor/lib64/libsensor_reg.so
index cb5d29a..59e435d 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/libsensor_reg.so and b/sdm660-common/proprietary/vendor/lib64/libsensor_reg.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsi.so b/sdm660-common/proprietary/vendor/lib64/libsi.so
old mode 100644
new mode 100755
index ad21b5a..66864d4
Binary files a/sdm660-common/proprietary/vendor/lib64/libsi.so and b/sdm660-common/proprietary/vendor/lib64/libsi.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libslimclient.so b/sdm660-common/proprietary/vendor/lib64/libslimclient.so
old mode 100644
new mode 100755
index 0493fc9..e253ce7
Binary files a/sdm660-common/proprietary/vendor/lib64/libslimclient.so and b/sdm660-common/proprietary/vendor/lib64/libslimclient.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsmemlog.so b/sdm660-common/proprietary/vendor/lib64/libsmemlog.so
old mode 100644
new mode 100755
index a1b4a5f..0a712c0
Binary files a/sdm660-common/proprietary/vendor/lib64/libsmemlog.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
old mode 100644
new mode 100755
index 465592c..0cffe75
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/libsubsystem_control.so b/sdm660-common/proprietary/vendor/lib64/libsubsystem_control.so
old mode 100644
new mode 100755
index e089cb3..eb6ea5c
Binary files a/sdm660-common/proprietary/vendor/lib64/libsubsystem_control.so and b/sdm660-common/proprietary/vendor/lib64/libsubsystem_control.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsynergy_loc_api.so b/sdm660-common/proprietary/vendor/lib64/libsynergy_loc_api.so
old mode 100644
new mode 100755
index 4733e6d..c6908f5
Binary files a/sdm660-common/proprietary/vendor/lib64/libsynergy_loc_api.so and b/sdm660-common/proprietary/vendor/lib64/libsynergy_loc_api.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsysmon_cdsp_skel.so b/sdm660-common/proprietary/vendor/lib64/libsysmon_cdsp_skel.so
old mode 100644
new mode 100755
index 2052eba..1d515f5
Binary files a/sdm660-common/proprietary/vendor/lib64/libsysmon_cdsp_skel.so and b/sdm660-common/proprietary/vendor/lib64/libsysmon_cdsp_skel.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libsystem_health_mon.so b/sdm660-common/proprietary/vendor/lib64/libsystem_health_mon.so
old mode 100644
new mode 100755
index f30e7dc..3c0670d
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/libthermalclient.so b/sdm660-common/proprietary/vendor/lib64/libthermalclient.so
old mode 100644
new mode 100755
index d9c07ae..6e57da7
Binary files a/sdm660-common/proprietary/vendor/lib64/libthermalclient.so and b/sdm660-common/proprietary/vendor/lib64/libthermalclient.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libtime_genoff.so b/sdm660-common/proprietary/vendor/lib64/libtime_genoff.so
old mode 100644
new mode 100755
index 07f4ab9..7fc88c7
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
old mode 100644
new mode 100755
index 0e1af2a..dc8a6e3
Binary files a/sdm660-common/proprietary/vendor/lib64/libtzdrmgenprov.so and b/sdm660-common/proprietary/vendor/lib64/libtzdrmgenprov.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libwms.so b/sdm660-common/proprietary/vendor/lib64/libwms.so
old mode 100644
new mode 100755
index 37b339b..83db469
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
old mode 100644
new mode 100755
index 006710c..6a334b9
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/libxtadapter.so b/sdm660-common/proprietary/vendor/lib64/libxtadapter.so
old mode 100644
new mode 100755
index 967ca85..f598f23
Binary files a/sdm660-common/proprietary/vendor/lib64/libxtadapter.so and b/sdm660-common/proprietary/vendor/lib64/libxtadapter.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libxtwifi_server_protocol.so b/sdm660-common/proprietary/vendor/lib64/libxtwifi_server_protocol.so
old mode 100644
new mode 100755
index 48f71bc..4cc9f31
Binary files a/sdm660-common/proprietary/vendor/lib64/libxtwifi_server_protocol.so and b/sdm660-common/proprietary/vendor/lib64/libxtwifi_server_protocol.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libxtwifi_server_protocol_uri_v3.so b/sdm660-common/proprietary/vendor/lib64/libxtwifi_server_protocol_uri_v3.so
old mode 100644
new mode 100755
index c5ff451..7218624
Binary files a/sdm660-common/proprietary/vendor/lib64/libxtwifi_server_protocol_uri_v3.so and b/sdm660-common/proprietary/vendor/lib64/libxtwifi_server_protocol_uri_v3.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/qcrild_librilutils.so b/sdm660-common/proprietary/vendor/lib64/qcrild_librilutils.so
old mode 100644
new mode 100755
index 94c5d1a..4d4efba
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
old mode 100644
new mode 100755
index b88e431..866ec83
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
old mode 100644
new mode 100755
index c7a9ee6..9878d3c
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/sensors.ssc.so b/sdm660-common/proprietary/vendor/lib64/sensors.ssc.so
index bde501b..8097700 100644
Binary files a/sdm660-common/proprietary/vendor/lib64/sensors.ssc.so and b/sdm660-common/proprietary/vendor/lib64/sensors.ssc.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so b/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so
deleted file mode 100644
index d899f2e..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so
deleted file mode 100644
index b538b13..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so and /dev/null 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
old mode 100644
new mode 100755
index c5f6594..1395bf7
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
old mode 100644
new mode 100755
index cb7d096..145d606
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
old mode 100644
new mode 100755
index d18cbe1..410a4dd
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so 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.factory@2.3.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.3.so
deleted file mode 100644
index 05a33e0..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.3.so and /dev/null 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
old mode 100644
new mode 100755
index 7c31c6f..f1253d8
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so 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
old mode 100644
new mode 100755
index 361d469..e72702a
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.gnss@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so
old mode 100644
new mode 100755
index 7e2fc4d..430ad7b
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so
old mode 100644
new mode 100755
index a193358..ef1fce9
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so
old mode 100644
new mode 100755
index eeeca9e..e0ddc89
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so
old mode 100644
new mode 100755
index d7ec92c..6d2df2c
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so
old mode 100644
new mode 100755
index 72e57ed..149c038
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.1.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so
old mode 100644
new mode 100755
index 476753b..397ef03
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@3.0.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so
old mode 100644
new mode 100755
index ab6ae46..cf2a3b9
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so
old mode 100644
new mode 100755
index e2a0ce5..baa88c3
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@4.0.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
old mode 100644
new mode 100755
index 4ae8105..a2882e8
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.cacert@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so
old mode 100644
new mode 100755
index 918142b..06b28cb
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.cacert@1.0.so 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
old mode 100644
new mode 100755
index ae296aa..42a0d41
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
old mode 100644
new mode 100755
index 257dc63..c6ab101
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
old mode 100644
new mode 100755
index 10c2fbb..20292d8
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
old mode 100644
new mode 100755
index 57bdb2f..95a5316
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
old mode 100644
new mode 100755
index 40b4a18..606ee56
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
old mode 100644
new mode 100755
index 2693e84..1df07a0
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.dynamicdds@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.1.so
deleted file mode 100644
index c1e3310..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.flow@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.flow@1.0.so
deleted file mode 100644
index 7d6a2cf..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.flow@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.flow@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.flow@1.1.so
deleted file mode 100644
index d714ff4..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.flow@1.1.so and /dev/null 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
old mode 100644
new mode 100755
index 4124b50..df64f99
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
old mode 100644
new mode 100755
index 9767744..c87126c
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.lce@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so
deleted file mode 100644
index 6075f8a..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so and /dev/null 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
old mode 100644
new mode 100755
index a4941f5..d146491
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.dsp@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so
old mode 100644
new mode 100755
index b03691c..bd18e66
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.dsp@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
old mode 100644
new mode 100755
index 5325150..1ccdf63
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
old mode 100644
new mode 100755
index e0bc96b..06210ad
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so 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.qccsyshal@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so
old mode 100644
new mode 100755
index ec5856a..f81b61e
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so and b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@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
old mode 100644
new mode 100755
index 63b29d8..1c6949f
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so 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
old mode 100644
new mode 100755
index 33dc241..0f5b4cf
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so 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
old mode 100644
new mode 100755
index 396cad6..1cbaa25
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so 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
old mode 100644
new mode 100755
index c72fc4b..4173700
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
old mode 100644
new mode 100755
index dbd1917..8bad7ed
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
old mode 100644
new mode 100755
index d748c9a..46c4284
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
old mode 100644
new mode 100755
index 515a43f..ac92536
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
old mode 100644
new mode 100755
index c284bf6..8f4d7e7
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
old mode 100644
new mode 100755
index b6508c7..413092c
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
old mode 100644
new mode 100755
index 4c4499f..4224b65
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
old mode 100644
new mode 100755
index a2300eb..894314f
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
old mode 100644
new mode 100755
index 6f8af2b..1796705
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
old mode 100644
new mode 100755
index 2124750..3e87e8e
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
old mode 100644
new mode 100755
index e5a7d9f..1295833
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.7.so 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.ims@1.8.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.8.so
deleted file mode 100644
index cc83ce6..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.8.so and /dev/null 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
old mode 100644
new mode 100755
index 1a062ab..9e79c24
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
old mode 100644
new mode 100755
index c1e79c3..853a687
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
old mode 100644
new mode 100755
index 06a431f..b71bfc1
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so 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.lpa@1.2.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so
deleted file mode 100644
index 473d2ac..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so and /dev/null 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
old mode 100644
new mode 100755
index 58e77b0..5ceb9a9
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
old mode 100644
new mode 100755
index 4b2f1d4..376673b
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
old mode 100644
new mode 100755
index 491babd..8d8b50c
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
old mode 100644
new mode 100755
index 01cefee..2d72e08
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
old mode 100644
new mode 100755
index 28a3a9b..cb9a7a9
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
old mode 100644
new mode 100755
index 5f938c1..e97966c
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
old mode 100644
new mode 100755
index 2242a29..36cc4a0
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
deleted file mode 100644
index cc3d5b6..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so and /dev/null 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
deleted file mode 100644
index abe7290..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.7.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.7.so
deleted file mode 100644
index 44e2158..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.7.so and /dev/null 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
old mode 100644
new mode 100755
index 67fa521..880ff1c
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
old mode 100644
new mode 100755
index fe1169a..a4f6ee4
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
old mode 100644
new mode 100755
index 2004ca9..c201357
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
old mode 100644
new mode 100755
index 661bbf4..420ff1d
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
old mode 100644
new mode 100755
index 7d7bb67..4fe22d9
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
old mode 100644
new mode 100755
index 47ae35a..5c3e191
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
old mode 100644
new mode 100755
index e1047a4..7006fef
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
old mode 100644
new mode 100755
index d9aa97c..80cadc1
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
old mode 100644
new mode 100755
index 26a2695..db92014
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
old mode 100644
new mode 100755
index bcf324d..7e1b185
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
old mode 100644
new mode 100755
index 7ee1ce3..80e4679
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
old mode 100644
new mode 100755
index e546de9..1faea05
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
old mode 100644
new mode 100755
index 7b47ebf..4669f35
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.factory@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.1.so
deleted file mode 100644
index 2f3a4ac..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.1.so and /dev/null 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
old mode 100644
new mode 100755
index 87a19e2..8a1f5ba
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
old mode 100644
new mode 100755
index bbccf0e..e25fcab
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
old mode 100644
new mode 100755
index 9b46c0c..fc7bad6
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
old mode 100644
new mode 100755
index 1c21b65..c03c550
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so 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
old mode 100644
new mode 100755
index 12106a0..6d05e2e
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
old mode 100644
new mode 100755
index 227fa21..c6060ae
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
old mode 100644
new mode 100755
index ea37248..944a4e9
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/lib64/vendor.qti.latency@2.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.1.so
deleted file mode 100644
index d4c1095..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.2.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.2.so
deleted file mode 100644
index 52f7bfe..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.2.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/qcril.db b/sdm660-common/proprietary/vendor/radio/qcril_database/qcril.db
old mode 100644
new mode 100755
index cd1dfdd..52a35a8
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
old mode 100644
new mode 100755
index 7eb5803..20a58fb
--- 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,524 +8,13 @@
 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('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('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('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));
 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('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('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','5');
 CREATE TABLE qcril_operator_specific_config(MCC TEXT, MNC TEXT, WPS_OVER_CS INTEGER, PRIMARY KEY(MCC, MNC));
@@ -537,180 +26,74 @@ 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';
+/* CEI ADD for E88 CRs - start */
+INSERT INTO qcril_emergency_source_mcc_table VALUES('425','100','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('530','111','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','050','060','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','050','066','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','090','060','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('334','090','066','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('440','118','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('440','119','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('440','110','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('218','122','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('218','123','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('218','124','','');
+/* CEI ADD for E88 CRs - end */
+/* <!-- THIS SETTINGS ARE GENERATED BY dsd2cc.py, PLEASE DO NOT MODIFY MANUALLY --> */
+INSERT INTO qcril_emergency_source_voice_table VALUES('228','117','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('228','118','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('228','143','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('228','144','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('228','145','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('228','147','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('228','01','117','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('228','01','118','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('228','01','143','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('228','01','144','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('228','01','145','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('228','01','147','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('234','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','02','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','10','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','15','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','30','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('234','33','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','02','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','03','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','07','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('272','999','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('295','01','117','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('295','01','118','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('295','01','143','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('295','01','144','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('295','01','145','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('295','01','147','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('505','000','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('505','02','000','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('505','90','000','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('530','05','111','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('530','24','111','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('530','24','000','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('530','24','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('530','24','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('530','99','111','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('655','10111','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('655','10177','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','01','10111','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','01','10177','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','02','10111','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','02','10177','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','07','10111','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','07','10177','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','10','10111','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','10','10177','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','131','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','132','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','133','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','134','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','137','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','102','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','123','123','','');
+/* <!-- END OF GENERATION BY dsd2cc.py --> */
 COMMIT;
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql
deleted file mode 100644
index 241cddf..0000000
--- a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-  Copyright (c) 2021 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
-*/
-
-BEGIN TRANSACTION;
-
-INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 10);
-
-INSERT INTO qcril_emergency_source_mcc_table VALUES('235','999','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('530','111','','');
-
-INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('235','999','','');
-
-COMMIT TRANSACTION;
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/11_version_update_ecc_table.sql b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/11_version_update_ecc_table.sql
deleted file mode 100644
index 3f44e3b..0000000
--- a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/11_version_update_ecc_table.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-  Copyright (c) 2022 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
-*/
-
-BEGIN TRANSACTION;
-
-INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 11);
-
-INSERT INTO qcril_emergency_source_mcc_table VALUES('450','111','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('450','113','','');
-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','122','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('450','125','','');
-
-INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','111','','');
-INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','112','','');
-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','118','','');
-INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','119','','');
-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_escv_iin_table VALUES('8982', '112', 1, 'home');
-INSERT INTO qcril_emergency_source_escv_iin_table VALUES('8982', '119', 4, 'home');
-INSERT INTO qcril_emergency_source_escv_iin_table VALUES('8982', '122', 8, 'home');
-INSERT INTO qcril_emergency_source_escv_iin_table VALUES('8982', '113', 3, 'home');
-INSERT INTO qcril_emergency_source_escv_iin_table VALUES('8982', '125', 9, 'home');
-INSERT INTO qcril_emergency_source_escv_iin_table VALUES('8982', '111', 6, 'home');
-INSERT INTO qcril_emergency_source_escv_iin_table VALUES('8982', '117', 18, 'home');
-INSERT INTO qcril_emergency_source_escv_iin_table VALUES('8982', '118', 19, 'home');
-
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('450', NULL, '112', 1);
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('450', NULL, '119', 4);
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('450', NULL, '122', 8);
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('450', NULL, '113', 3);
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('450', NULL, '125', 9);
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('450', NULL, '111', 6);
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('450', NULL, '117', 18);
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('450', NULL, '118', 19);
-
-COMMIT TRANSACTION;
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql
old mode 100644
new mode 100755
index 36cf2e6..21b8c9f
--- a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql
+++ b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql
@@ -9,10 +9,4 @@ BEGIN TRANSACTION;
 CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT,value TEXT, PRIMARY KEY(property));
 INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 1);
 
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '234' AND NUMBER = '999';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('234','999','','');
-
-DELETE FROM qcril_emergency_source_mcc_table WHERE MCC = '505' AND NUMBER = '000';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('505', '000', '','');
-
 COMMIT TRANSACTION;
diff --git a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql
old mode 100644
new mode 100755
index e994273..82da3cd
--- a/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql
+++ b/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql
@@ -35,7 +35,6 @@ INSERT INTO qcril_emergency_source_mcc_table VALUES('260','911','','');
 INSERT INTO qcril_emergency_source_mcc_table VALUES('262','112','','');
 INSERT INTO qcril_emergency_source_mcc_table VALUES('268','112','','');
 INSERT INTO qcril_emergency_source_mcc_table VALUES('272','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('272','999','','');
 INSERT INTO qcril_emergency_source_mcc_table VALUES('286','112','','');
 INSERT INTO qcril_emergency_source_mcc_table VALUES('302','999','','');
 INSERT INTO qcril_emergency_source_mcc_table VALUES('310','999','','');
diff --git a/sdm660-common/sdm660-common-vendor.mk b/sdm660-common/sdm660-common-vendor.mk
index 1b74302..8259e32 100644
--- a/sdm660-common/sdm660-common-vendor.mk
+++ b/sdm660-common/sdm660-common-vendor.mk
@@ -6,48 +6,27 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/asus/sdm660-common
 
 PRODUCT_COPY_FILES += \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/lpa.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/lpa.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/RemoteSimlock.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/RemoteSimlock.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/RemoteSimlockManager.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/RemoteSimlockManager.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/UimGba.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimGba.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/UimGbaManager.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimGbaManager.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/uimremoteclient.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/uimremoteclient.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/uimremoteserver.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/uimremoteserver.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/UimService.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimService.xml \
-    vendor/asus/sdm660-common/proprietary/odm/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service:$(TARGET_COPY_OUT_ODM)/bin/hw/vendor.dolby_v3_6.hardware.dms360@2.0-service \
     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/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.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.frameworks.core.addon.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.motorola.frameworks.core.addon.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.motosignature.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.motorola.motosignature.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.software.dolbyui.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.motorola.software.dolbyui.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 \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml \
     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/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/moto-checkin.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto-checkin.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/moto-settings.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto-settings.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/moto.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.dolby.daxservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-com.dolby.daxservice.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.android.providers.settings.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-com.motorola.android.providers.settings.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.dolby.dolbyui.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-com.motorola.dolby.dolbyui.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/datachannellib.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/datachannellib.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vendor.qti.ims.rcsservice.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.imsdcservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/vendor.qti.imsdcservice.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/sysconfig/config-com.dolby.daxservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/config-com.dolby.daxservice.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.android.providers.settings.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/config-com.motorola.android.providers.settings.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.dolby.dolbyui.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/config-com.motorola.dolby.dolbyui.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.motosignature.app.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/config-com.motorola.motosignature.app.xml \
+    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/framework/com.android.hotwordenrollment.common.util.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/com.android.hotwordenrollment.common.util.jar \
     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 \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@2.0.so \
@@ -90,31 +69,21 @@ PRODUCT_COPY_FILES += \
     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.factory@2.4.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@2.4.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.5.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@2.5.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 \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.cne.internal.server@1.1.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.cne.internal.server@1.2.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.connection@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.connection@1.0.so \
     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.dynamicdds@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.dynamicdds@1.1.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.flow@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.flow@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.flow@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.flow@1.1.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.iwlan@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.iwlan@1.1.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.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.qseecom@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qseecom@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.tui_comm@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 \
@@ -123,8 +92,6 @@ PRODUCT_COPY_FILES += \
     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.ims@1.8.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.8.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.qcrilhook@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so \
@@ -144,30 +111,14 @@ PRODUCT_COPY_FILES += \
     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.configservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.configservice@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.configservice@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.configservice@1.1.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.connection@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.connection@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.datachannelservice-V1-ndk.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.datachannelservice-V1-ndk.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.factory@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.factory@2.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.factory@2.1.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.factory@2.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.factory@2.2.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.ims.rcssip@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcssip@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcssip@1.1.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcssip@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcssip@1.2.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsuce@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsuce@1.1.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsuce@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsuce@1.2.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.imsrtpservice@3.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.1.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/system_ext/lib64/vendor.qti.latency@2.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.latency@2.2.so \
     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 \
     vendor/asus/sdm660-common/proprietary/vendor/bin/cnd:$(TARGET_COPY_OUT_VENDOR)/bin/cnd \
@@ -181,10 +132,10 @@ PRODUCT_COPY_FILES += \
     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.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.2-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@2.2-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.tui_comm@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.dolby.hardware.dms@2.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/ims_rtp_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ims_rtp_daemon \
     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 \
@@ -268,13 +219,19 @@ PRODUCT_COPY_FILES += \
     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/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.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.dolby.hardware.dms@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.hardware.dms@2.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.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@2.2-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.tui_comm@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.rmt_storage.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/perf/commonsysnodesconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonsysnodesconfigs.xml \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/perf/perfconfigstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfconfigstore.xml \
+    vendor/asus/sdm660-common/proprietary/vendor/etc/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \
+    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/permissions/android.hardware.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.light.xml \
     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 \
@@ -302,12 +259,14 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libApeSwDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libC2D2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libC2D2.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib/libCB.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFlacSwDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAacDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAlacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDecSw.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrwbplusDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDecSw.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxDsdDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxDsdDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxEvrcDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxG711Dec.so \
@@ -332,8 +291,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libc2d30_bltlib.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc2d30_bltlib.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libcdsp_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcdsp_default_listener.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libcdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcdsprpc.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libdapparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdapparamstorage.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libdeccfg.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdeccfg.so \
     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 \
@@ -355,12 +312,17 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmdsprpc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmmcamera_ppeiscore.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmcamera_ppeiscore.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal.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/libqmi_cci.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_cci.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_encdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmi_encdec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqmiservices.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqseed3.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 \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtigef.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsdedrm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdedrm.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsdm-color.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdm-color.so \
@@ -371,9 +333,6 @@ PRODUCT_COPY_FILES += \
     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/libsmwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsmwrapper.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ac4dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefright_soft_ac4dec.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libstagefright_soft_ddpdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefright_soft_ddpdec.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/libstagefrightdolby.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefrightdolby.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsubsystem_control.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsubsystem_control.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/libtinyxml2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtinyxml2_1.so \
@@ -395,10 +354,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/sensors.native.so:$(TARGET_COPY_OUT_VENDOR)/lib/sensors.native.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib/sensors.ssc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/soundfx/libasphere.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libasphere.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/soundfx/libswdap.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libswdap.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/soundfx/libswgamedap.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libswgamedap.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/soundfx/libswvqe.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libswvqe.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/vendor.dolby.hardware.dms@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.dolby.hardware.dms@2.0.so \
     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 \
@@ -441,6 +396,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vulkan.adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vulkan.adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libgpudataproducer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libgpudataproducer.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libhdmipassthru.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhdmipassthru.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/liblistensoundmodel2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblistensoundmodel2.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libssrec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssrec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/lib-imscmservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imscmservice.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/lib-imsdpl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-imsdpl.so \
@@ -459,6 +415,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libApeSwDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libC2D2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libC2D2.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libCB.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libFlacSwDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libGPreqcancel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel.so \
     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/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAacDec.so \
@@ -467,6 +424,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAmrDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAmrwbplusDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDecSw.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxEvrcDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxG711Dec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libOmxQcelp13Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxQcelp13Dec.so \
@@ -504,10 +462,8 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libcneqmiutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcneqmiutils.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libconfigdb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libconfigdb.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libcpion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcpion.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/libdapparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdapparamstorage.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libdataitems.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdataitems.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libdiag.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdiag.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/libdlbdsservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdlbdsservice.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libdpmqmihal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdpmqmihal.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libdrmfs.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdrmfs.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libdrmtime.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdrmtime.so \
@@ -554,6 +510,8 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/liboemcrypto.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liboemcrypto.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/libqcc_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcc_file_agent.so \
@@ -576,6 +534,9 @@ PRODUCT_COPY_FILES += \
     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 \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqsocket.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd-client.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib64/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-util.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqtigef.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/librcc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librcc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libril-qc-hal-qmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libril-qc-hal-qmi.so \
@@ -621,12 +582,9 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/soundfx/libqcreverb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libqcreverb.so \
     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/soundfx/libshoebox.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libshoebox.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.dolby.hardware.dms@2.0-impl.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.dolby.hardware.dms@2.0.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.factory@2.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.3.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.gnss@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.0.so \
@@ -647,12 +605,8 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.connection@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.connection@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.connection@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.dynamicdds@1.1.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.flow@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.flow@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.flow@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.flow@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.iwlan@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.iwlan@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.latency@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.lce@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.lce@1.0.so \
     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 \
@@ -671,11 +625,9 @@ PRODUCT_COPY_FILES += \
     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.ims@1.8.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.8.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.lpa@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.lpa@1.2.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 \
@@ -683,9 +635,6 @@ 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.qtiradio@2.7.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.qtiradio@2.7.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 \
@@ -699,7 +648,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callcapability@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callcapability@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.callinfo@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.callinfo@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.ims.factory@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.ims.factory@1.1.so \
     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 \
@@ -707,8 +655,6 @@ PRODUCT_COPY_FILES += \
     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 \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.1.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.latency@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.latency@2.2.so \
     vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db \
     vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/0_initial.sql \
     vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/1_version_intro.sql \
@@ -719,9 +665,7 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/6_version_update_ecc_table.sql \
     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 \
     vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/8_version_update_ecc_table.sql \
-    vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/9_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/9_version_update_ecc_table.sql \
-    vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/10_version_update_ecc_table.sql \
-    vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/11_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/11_version_update_ecc_table.sql
+    vendor/asus/sdm660-common/proprietary/vendor/radio/qcril_database/upgrade/9_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/9_version_update_ecc_table.sql
 
 PRODUCT_PACKAGES += \
     libthermalclient \
@@ -730,35 +674,19 @@ PRODUCT_PACKAGES += \
     CneApp \
     IWlanService \
     TimeService \
-    uimremoteclient \
-    uimremoteserver \
+    DeviceStatisticsService \
+    QtiTelephonyService \
     remoteSimLockAuthentication \
     remotesimlockservice \
-    uimlpaservice \
-    xdivert \
-    QtiTelephonyService \
-    MotoDolbyDax3 \
-    MotorolaSettingsProvider \
-    daxService \
     uceShimService \
-    HotwordEnrollmentOKGoogleHEXAGON \
-    HotwordEnrollmentXGoogleHEXAGON \
-    DynamicDDSService \
-    ImsDataChannelService \
-    ImsRcsService \
+    uimgbaservice \
+    uimlpaservice \
+    uimremoteclient \
+    uimremoteserver \
+    xdivert \
     ims \
     qcrilmsgtunnel \
-    com.motorola.frameworks.core.addon \
-    com.motorola.motosignature \
     tcmclient \
-    remotesimlockmanagerlibrary \
-    uimgbalibrary \
-    uimgbamanagerlibrary \
-    uimlpalibrary \
-    uimremoteclientlibrary \
-    uimremoteserverlibrary \
-    uimremotesimlocklibrary \
-    uimservicelibrary \
     ActivityExt \
     audiosphere \
     com.qti.dpmframework \
@@ -775,34 +703,30 @@ PRODUCT_PACKAGES += \
     com.quicinc.cne.constants-V2.0-java \
     com.quicinc.cne.constants-V2.1-java \
     dpmapi \
-    moto-checkin \
-    moto-settings \
-    moto \
-    datachannellib \
     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.factory-V2.4-java \
-    vendor.qti.data.factory-V2.5-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.cne.internal.server-V1.1-java \
-    vendor.qti.hardware.data.cne.internal.server-V1.2-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.dynamicdds-V1.1-java \
-    vendor.qti.hardware.data.flow-V1.0-java \
-    vendor.qti.hardware.data.flow-V1.1-java \
     vendor.qti.hardware.data.iwlan-V1.0-java \
-    vendor.qti.hardware.data.iwlan-V1.1-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 \
@@ -812,25 +736,10 @@ PRODUCT_PACKAGES += \
     vendor.qti.ims.callinfo-V1.0-java \
     vendor.qti.ims.factory-V1.0-java \
     vendor.qti.ims.factory-V1.1-java \
-    vendor.qti.ims.factory-V2.0-java \
-    vendor.qti.ims.factory-V2.1-java \
-    vendor.qti.ims.factory-V2.2-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.ims.configservice-V1.0-java \
-    vendor.qti.ims.configservice-V1.1-java \
-    vendor.qti.ims.connection-V1.0-java \
-    vendor.qti.ims.datachannelservice-V1-java \
-    vendor.qti.ims.rcssip-V1.0-java \
-    vendor.qti.ims.rcssip-V1.1-java \
-    vendor.qti.ims.rcssip-V1.2-java \
-    vendor.qti.ims.rcsuce-V1.0-java \
-    vendor.qti.ims.rcsuce-V1.1-java \
-    vendor.qti.ims.rcsuce-V1.2-java \
     vendor.qti.latency-V2.0-java \
-    vendor.qti.latency-V2.1-java \
-    vendor.qti.latency-V2.2-java \
     manifest_android.hardware.drm@1.3-service.widevine \
     vendor.qti.gnss@4.0-service