diff --git a/sdm660-common/Android.bp b/sdm660-common/Android.bp
index c88c3a1..30c2630 100644
--- a/sdm660-common/Android.bp
+++ b/sdm660-common/Android.bp
@@ -87,14 +87,36 @@ android_app_import {
 }
 
 android_app_import {
-	name: "DeviceStatisticsService",
+	name: "uimremoteclient",
 	owner: "asus",
-	apk: "proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk",
+	apk: "proprietary/product/app/uimremoteclient/uimremoteclient.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	system_ext_specific: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "uimremoteserver",
+	owner: "asus",
+	apk: "proprietary/product/app/uimremoteserver/uimremoteserver.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 {
@@ -108,28 +130,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-android_app_import {
-	name: "remoteSimLockAuthentication",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "remotesimlockservice",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "uceShimService",
 	owner: "asus",
@@ -142,9 +142,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "uimgbaservice",
+	name: "datastatusnotification",
 	owner: "asus",
-	apk: "proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk",
+	apk: "proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -153,42 +153,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "uimlpaservice",
+	name: "DeviceStatisticsService",
 	owner: "asus",
-	apk: "proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "uimremoteclient",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "uimremoteserver",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "xdivert",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/xdivert/xdivert.apk",
+	apk: "proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -226,6 +193,62 @@ 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: "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",
@@ -352,62 +375,6 @@ 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",
diff --git a/sdm660-common/proprietary/product/app/uimremoteclient/uimremoteclient.apk b/sdm660-common/proprietary/product/app/uimremoteclient/uimremoteclient.apk
new file mode 100644
index 0000000..226ac23
Binary files /dev/null and b/sdm660-common/proprietary/product/app/uimremoteclient/uimremoteclient.apk differ
diff --git a/sdm660-common/proprietary/product/app/uimremoteserver/uimremoteserver.apk b/sdm660-common/proprietary/product/app/uimremoteserver/uimremoteserver.apk
new file mode 100644
index 0000000..0767add
Binary files /dev/null and b/sdm660-common/proprietary/product/app/uimremoteserver/uimremoteserver.apk differ
diff --git a/sdm660-common/proprietary/product/app/xdivert/xdivert.apk b/sdm660-common/proprietary/product/app/xdivert/xdivert.apk
new file mode 100644
index 0000000..fbfd237
Binary files /dev/null and b/sdm660-common/proprietary/product/app/xdivert/xdivert.apk differ
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml b/sdm660-common/proprietary/product/etc/permissions/RemoteSimlock.xml
similarity index 80%
rename from sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml
rename to sdm660-common/proprietary/product/etc/permissions/RemoteSimlock.xml
index e3dfa1b..535694b 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml
+++ b/sdm660-common/proprietary/product/etc/permissions/RemoteSimlock.xml
@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.qti.remoteSimlock.uimremotesimlocklibrary"
-          file="/system_ext/framework/uimremotesimlocklibrary.jar"/>
+          file="/product/framework/uimremotesimlocklibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml b/sdm660-common/proprietary/product/etc/permissions/RemoteSimlockManager.xml
similarity index 84%
rename from sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml
rename to sdm660-common/proprietary/product/etc/permissions/RemoteSimlockManager.xml
index ac1bfb4..408045a 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml
+++ b/sdm660-common/proprietary/product/etc/permissions/RemoteSimlockManager.xml
@@ -7,6 +7,6 @@
 
 <permissions>
  <library name="com.qualcomm.qti.remoteSimlock.manager.remotesimlockmanagerlibrary"
-          file="/system_ext/framework/remotesimlockmanagerlibrary.jar"
+          file="/product/framework/remotesimlockmanagerlibrary.jar"
           dependency="com.qualcomm.qti.remoteSimlock.uimremotesimlocklibrary"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml b/sdm660-common/proprietary/product/etc/permissions/UimGba.xml
similarity index 82%
rename from sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml
rename to sdm660-common/proprietary/product/etc/permissions/UimGba.xml
index 159bd77..be261ae 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml
+++ b/sdm660-common/proprietary/product/etc/permissions/UimGba.xml
@@ -6,5 +6,5 @@
 -->
 <permissions>
  <library name="com.qualcomm.qti.uimGba.uimgbalibrary"
-          file="/system_ext/framework/uimgbalibrary.jar"/>
+          file="/product/framework/uimgbalibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml b/sdm660-common/proprietary/product/etc/permissions/UimGbaManager.xml
similarity index 84%
rename from sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml
rename to sdm660-common/proprietary/product/etc/permissions/UimGbaManager.xml
index 749da23..4e0c875 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml
+++ b/sdm660-common/proprietary/product/etc/permissions/UimGbaManager.xml
@@ -6,6 +6,6 @@
 -->
 <permissions>
  <library name="com.qualcomm.qti.uimGbaManager.uimgbamanagerlibrary"
-          file="/system_ext/framework/uimgbamanagerlibrary.jar"
+          file="/product/framework/uimgbamanagerlibrary.jar"
           dependency="com.qualcomm.qti.uimGba.uimgbalibrary"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml b/sdm660-common/proprietary/product/etc/permissions/UimService.xml
similarity index 70%
rename from sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml
rename to sdm660-common/proprietary/product/etc/permissions/UimService.xml
index 6d8ad89..0028367 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml
+++ b/sdm660-common/proprietary/product/etc/permissions/UimService.xml
@@ -7,6 +7,6 @@
 
 <permissions>
  <library name="com.qualcomm.qti.uim.uimservicelibrary"
-          file="/system_ext/framework/uimservicelibrary.jar"
-          dependency="qti-telephony-hidl-wrapper"/>
+          file="/product/framework/uimservicelibrary.jar"
+          dependency="qti-telephony-hidl-wrapper-prd"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml b/sdm660-common/proprietary/product/etc/permissions/lpa.xml
similarity index 82%
rename from sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml
rename to sdm660-common/proprietary/product/etc/permissions/lpa.xml
index 04d0399..4828ffa 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml
+++ b/sdm660-common/proprietary/product/etc/permissions/lpa.xml
@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.qti.lpa.uimlpalibrary"
-          file="/system_ext/framework/uimlpalibrary.jar"/>
+          file="/product/framework/uimlpalibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml b/sdm660-common/proprietary/product/etc/permissions/uimremoteclient.xml
similarity index 79%
rename from sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml
rename to sdm660-common/proprietary/product/etc/permissions/uimremoteclient.xml
index acc03be..0f8c002 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml
+++ b/sdm660-common/proprietary/product/etc/permissions/uimremoteclient.xml
@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.uimremoteclientlibrary"
-          file="/system_ext/framework/uimremoteclientlibrary.jar"/>
+          file="/product/framework/uimremoteclientlibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml b/sdm660-common/proprietary/product/etc/permissions/uimremoteserver.xml
similarity index 79%
rename from sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml
rename to sdm660-common/proprietary/product/etc/permissions/uimremoteserver.xml
index 0626f80..90017c2 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml
+++ b/sdm660-common/proprietary/product/etc/permissions/uimremoteserver.xml
@@ -8,5 +8,5 @@
 
 <permissions>
  <library name="com.qualcomm.uimremoteserverlibrary"
-          file="/system_ext/framework/uimremoteserverlibrary.jar"/>
+          file="/product/framework/uimremoteserverlibrary.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/product/framework/remotesimlockmanagerlibrary.jar b/sdm660-common/proprietary/product/framework/remotesimlockmanagerlibrary.jar
new file mode 100644
index 0000000..ff4a4df
Binary files /dev/null and b/sdm660-common/proprietary/product/framework/remotesimlockmanagerlibrary.jar differ
diff --git a/sdm660-common/proprietary/product/framework/uimgbalibrary.jar b/sdm660-common/proprietary/product/framework/uimgbalibrary.jar
new file mode 100644
index 0000000..1ccdd57
Binary files /dev/null and b/sdm660-common/proprietary/product/framework/uimgbalibrary.jar differ
diff --git a/sdm660-common/proprietary/product/framework/uimgbamanagerlibrary.jar b/sdm660-common/proprietary/product/framework/uimgbamanagerlibrary.jar
new file mode 100644
index 0000000..0e58a1c
Binary files /dev/null and b/sdm660-common/proprietary/product/framework/uimgbamanagerlibrary.jar differ
diff --git a/sdm660-common/proprietary/product/framework/uimlpalibrary.jar b/sdm660-common/proprietary/product/framework/uimlpalibrary.jar
new file mode 100644
index 0000000..2b252eb
Binary files /dev/null and b/sdm660-common/proprietary/product/framework/uimlpalibrary.jar differ
diff --git a/sdm660-common/proprietary/product/framework/uimremoteclientlibrary.jar b/sdm660-common/proprietary/product/framework/uimremoteclientlibrary.jar
new file mode 100644
index 0000000..d105c04
Binary files /dev/null and b/sdm660-common/proprietary/product/framework/uimremoteclientlibrary.jar differ
diff --git a/sdm660-common/proprietary/product/framework/uimremoteserverlibrary.jar b/sdm660-common/proprietary/product/framework/uimremoteserverlibrary.jar
new file mode 100644
index 0000000..2803118
Binary files /dev/null and b/sdm660-common/proprietary/product/framework/uimremoteserverlibrary.jar differ
diff --git a/sdm660-common/proprietary/product/framework/uimremotesimlocklibrary.jar b/sdm660-common/proprietary/product/framework/uimremotesimlocklibrary.jar
new file mode 100644
index 0000000..2ab9337
Binary files /dev/null and b/sdm660-common/proprietary/product/framework/uimremotesimlocklibrary.jar differ
diff --git a/sdm660-common/proprietary/product/framework/uimservicelibrary.jar b/sdm660-common/proprietary/product/framework/uimservicelibrary.jar
new file mode 100644
index 0000000..6e80c9d
Binary files /dev/null and b/sdm660-common/proprietary/product/framework/uimservicelibrary.jar differ
diff --git a/sdm660-common/proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk b/sdm660-common/proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk
index f9ae9a7..ce8a7e6 100644
Binary files a/sdm660-common/proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk and b/sdm660-common/proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk b/sdm660-common/proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk
new file mode 100644
index 0000000..7e250cb
Binary files /dev/null and b/sdm660-common/proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk differ
diff --git a/sdm660-common/proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk b/sdm660-common/proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk
deleted file mode 100755
index e83f50f..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk b/sdm660-common/proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk
deleted file mode 100644
index 98a68a5..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk b/sdm660-common/proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk
deleted file mode 100644
index 5890d50..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk b/sdm660-common/proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk
deleted file mode 100755
index 3152c24..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk b/sdm660-common/proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk
deleted file mode 100755
index fb83021..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk b/sdm660-common/proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk
deleted file mode 100755
index 125bb60..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/xdivert/xdivert.apk b/sdm660-common/proprietary/system_ext/app/xdivert/xdivert.apk
deleted file mode 100755
index bb2b988..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/xdivert/xdivert.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml b/sdm660-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml
index 1f897af..aeff78e 100644
--- a/sdm660-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml
+++ b/sdm660-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml
@@ -6,5 +6,5 @@
  -->
 <permissions>
     <library name="android.hidl.manager-V1.0-java"
-          file="/system/framework/android.hidl.manager-V1.0-java.jar"/>
+          file="/system_ext/framework/android.hidl.manager-V1.0-java.jar"/>
 </permissions>
diff --git a/sdm660-common/proprietary/system_ext/framework/remotesimlockmanagerlibrary.jar b/sdm660-common/proprietary/system_ext/framework/remotesimlockmanagerlibrary.jar
deleted file mode 100644
index 7c4b203..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/remotesimlockmanagerlibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimgbalibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimgbalibrary.jar
deleted file mode 100644
index cc681ec..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/uimgbalibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimgbamanagerlibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimgbamanagerlibrary.jar
deleted file mode 100644
index 368acf1..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/uimgbamanagerlibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimlpalibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimlpalibrary.jar
deleted file mode 100644
index bd797fd..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/uimlpalibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimremoteclientlibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimremoteclientlibrary.jar
deleted file mode 100644
index ba90f6b..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/uimremoteclientlibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimremoteserverlibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimremoteserverlibrary.jar
deleted file mode 100644
index 843b1b6..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/uimremoteserverlibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimremotesimlocklibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimremotesimlocklibrary.jar
deleted file mode 100644
index f929157..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/uimremotesimlocklibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/uimservicelibrary.jar b/sdm660-common/proprietary/system_ext/framework/uimservicelibrary.jar
deleted file mode 100644
index e777dbb..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/uimservicelibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libembmsmmosal.so b/sdm660-common/proprietary/system_ext/lib64/libembmsmmosal.so
old mode 100755
new mode 100644
index f7407db..246e973
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
old mode 100755
new mode 100644
index bd3ff53..8b1f908
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
old mode 100755
new mode 100644
index b1f1b9e..25f0b7a
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
old mode 100755
new mode 100644
index 2b4f73a..5c2ef69
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/vendor/etc/data/netmgr_config.xml b/sdm660-common/proprietary/vendor/etc/data/netmgr_config.xml
old mode 100755
new mode 100644
index 7a17a0d..3b82771
--- 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-2021 Qualcomm Technologies, Inc.
+     Copyright (c) 2013, 2016-2022 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -2803,6 +2803,7 @@
       <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>
@@ -3224,16 +3225,16 @@
       <data name="static_rev_links" type="int"> 4 </data>
    </listitem>
 
-   <!-- monaco parameters -->
-   <listitem name = "monaco">
+   <!-- lahaina_pt parameters -->
+   <listitem name = "lahaina_pt">
 
       <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="kfc_mode" type="int"> 4 </data>
+      <data name="kfc_qmap" type="int"> 1 </data>
+      <data name="qmi_pc" type="int"> 1 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
       <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
 
@@ -3251,13 +3252,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"> 0 </data>
-      <data name="rsb" type="int"> 0 </data>
+      <data name="rsc" type="int"> 2 </data>
+      <data name="rsb" type="int"> 2 </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="rmnet_offload" type="int"> 1 </data>
+      <data name="rmnet_shs" type="int"> 1 </data>
+      <data name="uplink_priority" type="int"> 1 </data>
       <data name="iwlan_concurrency" type="int"> 1 </data>
       <data name="nl_xfrm" type="int"> 1 </data>
       <data name="netdev_max_backlog" type="int"> 100000 </data>
@@ -3366,4 +3367,234 @@
       <!-- 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/imsdatadaemon.rc b/sdm660-common/proprietary/vendor/etc/init/imsdatadaemon.rc
index 6db60d2..1dd448e 100644
--- a/sdm660-common/proprietary/vendor/etc/init/imsdatadaemon.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/imsdatadaemon.rc
@@ -8,7 +8,7 @@ service vendor.imsdatadaemon /vendor/bin/imsdatadaemon
     class main
     user radio
     socket ims_datad stream 0660 system radio
-    group radio wifi inet vendor_qti_diag log
+    group radio wifi inet log
     disabled
 
 on property:vendor.ims.QMI_DAEMON_STATUS=1
diff --git a/sdm660-common/proprietary/vendor/etc/init/imsqmidaemon.rc b/sdm660-common/proprietary/vendor/etc/init/imsqmidaemon.rc
index c39f8e4..ab7e1e4 100644
--- a/sdm660-common/proprietary/vendor/etc/init/imsqmidaemon.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/imsqmidaemon.rc
@@ -7,4 +7,4 @@ service vendor.imsqmidaemon /vendor/bin/imsqmidaemon
     class main
     user radio
     socket ims_qmid stream 0660 system radio
-    group radio vendor_qti_diag log
+    group radio log
diff --git a/sdm660-common/proprietary/vendor/etc/init/imsrcsd.rc b/sdm660-common/proprietary/vendor/etc/init/imsrcsd.rc
index c2643ec..7276b4c 100644
--- a/sdm660-common/proprietary/vendor/etc/init/imsrcsd.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/imsrcsd.rc
@@ -5,4 +5,4 @@
 service vendor.imsrcsservice /vendor/bin/imsrcsd
     class main
     user radio
-    group radio vendor_qti_diag log inet wakelock
+    group radio log inet wakelock
diff --git a/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc b/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
index 755090a..1fe38e4 100644
--- a/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc
@@ -9,7 +9,7 @@ on boot
 
     #Assign TCP buffer thresholds to be ceiling value of technology maximums
     #Increased technology maximums should be reflected here.
-    write /proc/sys/net/core/rmem_max  16777216
+    write /proc/sys/net/core/rmem_max  8388608
     write /proc/sys/net/core/wmem_max  8388608
 
     #Load rmnet_core driver
@@ -21,8 +21,8 @@ on boot
 # msm specific files that need to be created on /data
 on post-fs-data
     #Create NETMGR daemon log dir
-    mkdir /data/vendor/netmgr 0770 radio radio
-    chmod 0770 /data/vendor/netmgr
+    mkdir /data/vendor/netmgr 0771 radio radio
+    chmod 0771 /data/vendor/netmgr
 
     # Create netmgr recovery folder
     mkdir /data/vendor/netmgr/recovery 0700 radio radio
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.qti.rmt_storage.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc
index ffde8db..74b9d65 100644
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc
+++ b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc
@@ -7,5 +7,6 @@
 service vendor.rmt_storage /vendor/bin/rmt_storage
     class core
     user root
+    group system wakelock
     shutdown critical
-    ioprio rt 0
\ No newline at end of file
+    ioprio rt 0
diff --git a/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy b/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
index 3ed54f6..38dc4c9 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/sdm660-common-vendor.mk b/sdm660-common/sdm660-common-vendor.mk
index 028d419..358535c 100644
--- a/sdm660-common/sdm660-common-vendor.mk
+++ b/sdm660-common/sdm660-common-vendor.mk
@@ -6,25 +6,25 @@ 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/UimService.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimService.xml \
     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.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/lpa.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/lpa.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_libpermissions.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/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/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
@@ -678,20 +678,24 @@ PRODUCT_PACKAGES += \
     CneApp \
     IWlanService \
     TimeService \
-    DeviceStatisticsService \
-    QtiTelephonyService \
-    imssettings \
-    remoteSimLockAuthentication \
-    remotesimlockservice \
-    uceShimService \
-    uimgbaservice \
-    uimlpaservice \
     uimremoteclient \
     uimremoteserver \
     xdivert \
+    QtiTelephonyService \
+    uceShimService \
+    datastatusnotification \
+    DeviceStatisticsService \
     ims \
     qcrilmsgtunnel \
     tcmclient \
+    remotesimlockmanagerlibrary \
+    uimgbalibrary \
+    uimgbamanagerlibrary \
+    uimlpalibrary \
+    uimremoteclientlibrary \
+    uimremoteserverlibrary \
+    uimremotesimlocklibrary \
+    uimservicelibrary \
     ActivityExt \
     audiosphere \
     com.qti.dpmframework \
@@ -710,14 +714,6 @@ PRODUCT_PACKAGES += \
     dpmapi \
     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 \