diff --git a/Android.bp b/Android.bp
index fcf3644..b61725e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -89,17 +89,6 @@ android_app_import {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "com.qualcomm.qti.gpudrivers.lahaina.api30",
-	owner: "motorola",
-	apk: "proprietary/vendor/app/com.qualcomm.qti.gpudrivers.lahaina.api30/com.qualcomm.qti.gpudrivers.lahaina.api30.apk",
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	soc_specific: true,
-}
-
 android_app_import {
 	name: "uimgbaservice",
 	owner: "motorola",
@@ -299,18 +288,18 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-	name: "c2_manifest_vendor",
+	name: "manifest_android.hardware.drm@1.3-service.widevine",
 	owner: "motorola",
-	src: "proprietary/vendor/etc/vintf/manifest/c2_manifest_vendor.xml",
+	src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml",
 	filename_from_src: true,
 	sub_dir: "vintf/manifest",
 	soc_specific: true,
 }
 
 prebuilt_etc_xml {
-	name: "manifest_android.hardware.drm@1.3-service.widevine",
+	name: "vendor.dolby.media.c2@1.0-service",
 	owner: "motorola",
-	src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml",
+	src: "proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml",
 	filename_from_src: true,
 	sub_dir: "vintf/manifest",
 	soc_specific: true,
diff --git a/proprietary/product/app/uimgbaservice/uimgbaservice.apk b/proprietary/product/app/uimgbaservice/uimgbaservice.apk
index 36af96d..fd3a296 100644
Binary files a/proprietary/product/app/uimgbaservice/uimgbaservice.apk and b/proprietary/product/app/uimgbaservice/uimgbaservice.apk differ
diff --git a/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk
index 6788aa3..4f87f01 100644
Binary files a/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk and b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk differ
diff --git a/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk b/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk
index 101d7f1..3425be5 100644
Binary files a/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk and b/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk differ
diff --git a/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk b/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk
index d97a8ff..13a8dcd 100644
Binary files a/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk and b/proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk differ
diff --git a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
index 1882e2f..546bd54 100644
Binary files a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk and b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk differ
diff --git a/proprietary/system_ext/framework/moto-telephony.jar b/proprietary/system_ext/framework/moto-telephony.jar
index 0aa2bf7..a9f6f38 100644
Binary files a/proprietary/system_ext/framework/moto-telephony.jar and b/proprietary/system_ext/framework/moto-telephony.jar differ
diff --git a/proprietary/system_ext/lib64/lib-imsvideocodec.so b/proprietary/system_ext/lib64/lib-imsvideocodec.so
index 3a9cc76..d77d263 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvideocodec.so and b/proprietary/system_ext/lib64/lib-imsvideocodec.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvt.so b/proprietary/system_ext/lib64/lib-imsvt.so
index 36336a0..f3dfa67 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvt.so and b/proprietary/system_ext/lib64/lib-imsvt.so differ
diff --git a/proprietary/system_ext/lib64/libdiag_system.so b/proprietary/system_ext/lib64/libdiag_system.so
index ec3ac91..a527243 100644
Binary files a/proprietary/system_ext/lib64/libdiag_system.so and b/proprietary/system_ext/lib64/libdiag_system.so differ
diff --git a/proprietary/system_ext/lib64/libwfdnative.so b/proprietary/system_ext/lib64/libwfdnative.so
index c2151d5..c6d2706 100644
Binary files a/proprietary/system_ext/lib64/libwfdnative.so and b/proprietary/system_ext/lib64/libwfdnative.so differ
diff --git a/proprietary/system_ext/priv-app/WfdService/WfdService.apk b/proprietary/system_ext/priv-app/WfdService/WfdService.apk
index e7b291c..a95bf24 100644
Binary files a/proprietary/system_ext/priv-app/WfdService/WfdService.apk and b/proprietary/system_ext/priv-app/WfdService/WfdService.apk differ
diff --git a/proprietary/system_ext/priv-app/ims/ims.apk b/proprietary/system_ext/priv-app/ims/ims.apk
index 340e44d..f467a58 100644
Binary files a/proprietary/system_ext/priv-app/ims/ims.apk and b/proprietary/system_ext/priv-app/ims/ims.apk differ
diff --git a/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
index 20d5371..3e0e9a4 100644
Binary files a/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk and b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk differ
diff --git a/proprietary/vendor/app/CACertService/CACertService.apk b/proprietary/vendor/app/CACertService/CACertService.apk
index 70753ed..eef49ac 100644
Binary files a/proprietary/vendor/app/CACertService/CACertService.apk and b/proprietary/vendor/app/CACertService/CACertService.apk differ
diff --git a/proprietary/vendor/app/CneApp/CneApp.apk b/proprietary/vendor/app/CneApp/CneApp.apk
index d612760..fdd68dc 100644
Binary files a/proprietary/vendor/app/CneApp/CneApp.apk and b/proprietary/vendor/app/CneApp/CneApp.apk differ
diff --git a/proprietary/vendor/app/IWlanService/IWlanService.apk b/proprietary/vendor/app/IWlanService/IWlanService.apk
index c68b87f..ccbd85f 100644
Binary files a/proprietary/vendor/app/IWlanService/IWlanService.apk and b/proprietary/vendor/app/IWlanService/IWlanService.apk differ
diff --git a/proprietary/vendor/app/TimeService/TimeService.apk b/proprietary/vendor/app/TimeService/TimeService.apk
index 3177deb..d4d5e61 100644
Binary files a/proprietary/vendor/app/TimeService/TimeService.apk and b/proprietary/vendor/app/TimeService/TimeService.apk differ
diff --git a/proprietary/vendor/bin/ATFWD-daemon b/proprietary/vendor/bin/ATFWD-daemon
index 1528822..c8aae3f 100755
Binary files a/proprietary/vendor/bin/ATFWD-daemon and b/proprietary/vendor/bin/ATFWD-daemon differ
diff --git a/proprietary/vendor/bin/cnss-daemon b/proprietary/vendor/bin/cnss-daemon
index d080d62..f92b7fe 100755
Binary files a/proprietary/vendor/bin/cnss-daemon and b/proprietary/vendor/bin/cnss-daemon differ
diff --git a/proprietary/vendor/bin/diag-router b/proprietary/vendor/bin/diag-router
index 0321c2a..4345197 100755
Binary files a/proprietary/vendor/bin/diag-router and b/proprietary/vendor/bin/diag-router differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
index 13b9868..46ab4d7 100644
Binary files a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti and b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
index 4abb498..2249c6c 100644
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service and b/proprietary/vendor/bin/hw/vendor.qti.hardware.iop@2.0-service differ
diff --git a/proprietary/vendor/bin/loadalgo b/proprietary/vendor/bin/loadalgo
index fee8f15..fa5dd7d 100755
Binary files a/proprietary/vendor/bin/loadalgo and b/proprietary/vendor/bin/loadalgo differ
diff --git a/proprietary/vendor/bin/lowi-server b/proprietary/vendor/bin/lowi-server
index 21a5486..6b60e62 100755
Binary files a/proprietary/vendor/bin/lowi-server and b/proprietary/vendor/bin/lowi-server differ
diff --git a/proprietary/vendor/bin/netmgrd b/proprietary/vendor/bin/netmgrd
index ea92f9a..570d0f8 100755
Binary files a/proprietary/vendor/bin/netmgrd and b/proprietary/vendor/bin/netmgrd differ
diff --git a/proprietary/vendor/bin/pd-mapper b/proprietary/vendor/bin/pd-mapper
index 6d8a9b2..e708174 100755
Binary files a/proprietary/vendor/bin/pd-mapper and b/proprietary/vendor/bin/pd-mapper differ
diff --git a/proprietary/vendor/bin/qmi_motext_hook b/proprietary/vendor/bin/qmi_motext_hook
index 82661aa..fee4725 100755
Binary files a/proprietary/vendor/bin/qmi_motext_hook and b/proprietary/vendor/bin/qmi_motext_hook differ
diff --git a/proprietary/vendor/bin/qseecomd b/proprietary/vendor/bin/qseecomd
index 7388f82..8298d45 100755
Binary files a/proprietary/vendor/bin/qseecomd and b/proprietary/vendor/bin/qseecomd differ
diff --git a/proprietary/vendor/bin/rmt_storage b/proprietary/vendor/bin/rmt_storage
index 9f8f9f9..df9ca97 100755
Binary files a/proprietary/vendor/bin/rmt_storage and b/proprietary/vendor/bin/rmt_storage differ
diff --git a/proprietary/vendor/bin/xtra-daemon b/proprietary/vendor/bin/xtra-daemon
index 00a602c..7e2b378 100755
Binary files a/proprietary/vendor/bin/xtra-daemon and b/proprietary/vendor/bin/xtra-daemon differ
diff --git a/proprietary/vendor/etc/data/netmgr_config.xml b/proprietary/vendor/etc/data/netmgr_config.xml
index d99bbcc..aee2d05 100644
--- a/proprietary/vendor/etc/data/netmgr_config.xml
+++ b/proprietary/vendor/etc/data/netmgr_config.xml
@@ -3127,6 +3127,7 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 125 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="skip_buffered_qos_modify" 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>
@@ -3270,6 +3271,7 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 125 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="skip_buffered_qos_modify" 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>
diff --git a/proprietary/vendor/etc/lm/gPLAFFeature.xml b/proprietary/vendor/etc/lm/gPLAFFeature.xml
index 3f130fd..1d72cdf 100644
--- a/proprietary/vendor/etc/lm/gPLAFFeature.xml
+++ b/proprietary/vendor/etc/lm/gPLAFFeature.xml
@@ -20,6 +20,12 @@
 <Feature>
     <Name>gPLAFFeature</Name>
     <Libname>libgplaf.so</Libname>
+    <Configs target="lahaina">
+        <Resources_Big>0x40800200,0x40800000</Resources_Big>
+        <Resources_Lil>0x40800100</Resources_Lil>
+        <Boost_Heavy>2246,1804</Boost_Heavy>
+        <Boost_Light>1651,1324</Boost_Light>
+    </Configs>
     <Configs target="shima">
         <Resources_Big>0x40800200,0x40800000</Resources_Big>
         <Resources_Lil>0x40800100</Resources_Lil>
@@ -57,12 +63,7 @@
            <AsyncType>-1</AsyncType>
         </Trigger>
     </Triggers>
-    <IgnoredApps target="shima">
-        <App>com.google.android.gms</App>
-        <App>com.android.vending</App>
-        <App>com.google.android.projection.gearhead</App>
-    </IgnoredApps>
-    <IgnoredApps target="yupik">
+    <IgnoredApps>
         <App>com.google.android.gms</App>
         <App>com.android.vending</App>
         <App>com.google.android.projection.gearhead</App>
diff --git a/proprietary/vendor/etc/perf/perfboostsconfig.xml b/proprietary/vendor/etc/perf/perfboostsconfig.xml
index def4bdf..baa9bd5 100644
--- a/proprietary/vendor/etc/perf/perfboostsconfig.xml
+++ b/proprietary/vendor/etc/perf/perfboostsconfig.xml
@@ -56,7 +56,7 @@
        <Config
            Id="0x00001081" Type="1" Enable="true" Timeout="2000" Target="yupik"
            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
-                      0x40800000, 1497, 0x40800100, 1497, 0x40800200, 1766" />
+                      0x40800000, 1516, 0x40800100, 1516, 0x40800200, 1766" />
 
     <!--app lauch boost (disabling packing)-->
 
@@ -150,6 +150,7 @@
         <!-- CPUBOOST_MIN_FREQ PRIME Core resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->
+        <!-- CPUBW_MAX_FREQ resource opcode, value-->
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- LLCCBW resource opcode, value-->
         <!-- L3 resource opcode, value-->
@@ -161,8 +162,8 @@
                        0x40C74000, 0xF0, 0x40408000, 0x63, 0x40C20000, 0x28,
                        0x40C1C000, 0x3C, 0x40C20200, 0x28, 0x40C1C200, 0x3C,
                        0x42C10000, 0x1, 0x40800200, 0x76C, 0x40800000, 0x76C,
-                       0x40800100, 0x4B0, 0x43010000, 0x50, 0x41828000, 0x3A,
-                       0x43400000, 0x3480" />
+                       0x40800100, 0x4B0, 0x43018000, 0xFF, 0x43010000, 0x50,
+                       0x41828000, 0x3A, 0x43400000, 0x3480" />
 
      <!-- config_enableLaunchBoost6-->
         <!-- SLB_BIG_CORE_1, val-->
@@ -235,10 +236,21 @@
                       0x40800000, 0xFFF, 0x40800100, 0xFFF, 0x40800200, 0xFFF" />
 
        <Config
-           Id="0x00001083" Enable="true" Timeout="400" Target="yupik"
+           Id="0x00001083" Enable="true" Timeout="400" Target="yupik"  Fps="60"
            Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
-                      0x40800000, 0xFFF, 0x40800100, 0xFFF, 0x40800200, 0xFFF" />
-
+                      0x40800000, 1344, 0x40800100, 1324, 0x40800200, 1324" />
+       <Config
+           Id="0x00001083" Enable="true" Timeout="400" Target="yupik"  Fps="90"
+           Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
+                      0x40800000, 1344, 0x40800100, 1324, 0x40800200, 1324" />
+       <Config
+           Id="0x00001083" Enable="true" Timeout="400" Target="yupik"  Fps="120"
+           Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
+                      0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516" />
+       <Config
+           Id="0x00001083" Enable="true" Timeout="400" Target="yupik"  Fps="144"
+           Resources="0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40804200, 0xFFF,
+                      0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516" />
     <!--Vertical Scroll boost-->
         <!-- LLCBW_MIN_FREQ resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
@@ -295,8 +307,8 @@
 
         <Config
             Id="0x00001080" Type="1" Enable="true" Target="yupik" Fps="60"
-            Resources="0x43010000, 0x26, 0x40800000, 1228, 0x40800100, 1152, 0x40800200, 1056,
-                       0x40C00000, 2" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2"  />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
@@ -313,8 +325,8 @@
 
         <Config
             Id="0x00001080" Type="1" Enable="true" Target="yupik" Fps="90"
-            Resources="0x43010000, 0x26, 0x40800000, 1651, 0x40800100, 1324, 0x40800200, 1766,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2"  />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
@@ -335,9 +347,8 @@
 
         <Config
             Id="0x00001080" Type="1" Enable="true" Target="yupik" Fps="120"
-            Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2"  />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
@@ -349,20 +360,18 @@
         <!-- MIN_ONLINE_CPU_CLUSTER_BIG opcode, value-->
         <!-- SCHED_MIN_TASK_UTIL_FOR_COLOCATION, value-->
         <!-- SCHED_MIN_TASK_UTIL_FOR_BOOST, value-->
-        <!-- LLCBW_MIN_FREQ resource opcode, value-->
         <!-- L3_MEMLAT_MIN_FREQ resource opcode, value -->
 
         <Config
             Id="0x00001080" Type="1" Enable="true" Target="shima" Fps="144"
             Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
                        0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0, 0x43010000, 0x11, 0x43400000, 0x1F40" />
+                       0x40C78000, 0, 0x40C7C000, 0, 0x43400000, 0x1F40" />
 
         <Config
             Id="0x00001080" Type="1" Enable="true" Target="yupik" Fps="144"
-            Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0, 0x43010000, 0x11, 0x43400000, 0x1F40" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2" />
 
 
     <!--Horizontal Scroll boost-->
@@ -380,7 +389,7 @@
 
         <Config
             Id="0x00001080" Type="2" Enable="true" Target="yupik" Fps="60"
-            Resources="0x43010000, 0x26, 0x40800000, 1228, 0x40800100, 1152, 0x40800200, 1056,
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
                        0x40C00000, 2" />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
@@ -398,8 +407,8 @@
 
         <Config
             Id="0x00001080" Type="2" Enable="true" Target="yupik" Fps="90"
-            Resources="0x43010000, 0x26, 0x40800000, 1651, 0x40800100, 1324, 0x40800200, 1766,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2" />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
@@ -420,9 +429,8 @@
 
         <Config
             Id="0x00001080" Type="2" Enable="true" Target="yupik" Fps="120"
-            Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2" />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
@@ -434,20 +442,18 @@
         <!-- MIN_ONLINE_CPU_CLUSTER_BIG opcode, value-->
         <!-- SCHED_MIN_TASK_UTIL_FOR_COLOCATION, value-->
         <!-- SCHED_MIN_TASK_UTIL_FOR_BOOST, value-->
-        <!-- LLCBW_MIN_FREQ resource opcode, value-->
         <!-- L3_MEMLAT_MIN_FREQ resource opcode, value -->
 
         <Config
             Id="0x00001080" Type="2" Enable="true" Target="shima" Fps="144"
             Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
                        0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0, 0x43010000, 0x11, 0x43400000, 0x1F40" />
+                       0x40C78000, 0, 0x40C7C000, 0, 0x43400000, 0x1F40" />
 
         <Config
             Id="0x00001080" Type="2" Enable="true" Target="yupik" Fps="144"
-            Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0, 0x43010000, 0x11, 0x43400000, 0x1F40" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2" />
 
     <!--Prefling Scroll boost-->
         <!-- LLCBW_MIN_FREQ resource opcode, value-->
@@ -523,8 +529,8 @@
 
         <Config
             Id="0x00001080" Type="4" Enable="true" Timeout="115" Target="yupik" Fps="90"
-            Resources="0x43010000, 0x26, 0x40800000, 1651, 0x40800100, 1324, 0x40800200, 1766,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2"  />
 
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
@@ -546,9 +552,8 @@
 
         <Config
             Id="0x00001080" Type="4" Enable="true" Timeout="115" Target="yupik" Fps="120"
-            Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2"  />
 
         <!-- CPUBW_MIN_FREQ resource opcode, value-->
         <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->
@@ -560,20 +565,18 @@
         <!-- MIN_ONLINE_CPU_CLUSTER_BIG opcode, value-->
         <!-- SCHED_MIN_TASK_UTIL_FOR_COLOCATION, value-->
         <!-- SCHED_MIN_TASK_UTIL_FOR_BOOST, value-->
-        <!-- LLCBW_MIN_FREQ resource opcode, value-->
         <!-- L3_MEMLAT_MIN_FREQ resource opcode, value -->
 
         <Config
             Id="0x00001080" Type="4" Enable="true" Timeout="115" Target="shima" Fps="144"
             Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
                        0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0, 0x43010000, 0x11, 0x43400000, 0x1F40" />
+                       0x40C78000, 0, 0x40C7C000, 0, 0x43400000, 0x1F40" />
 
         <Config
             Id="0x00001080" Type="4" Enable="true" Timeout="115" Target="yupik" Fps="144"
-            Resources="0x43010000, 0x26, 0x40800000, 1900, 0x40800100, 1516, 0x40800200, 1862,
-                       0x40C00000, 2, 0x40C74000, 0xF0, 0x40408000, 0x27, 0x41000000, 3,
-                       0x40C78000, 0, 0x40C7C000, 0, 0x43010000, 0x11, 0x43400000, 0x1F40" />
+            Resources="0x43010000, 0x26, 0x40800000, 1516, 0x40800100, 1324, 0x40800200, 1516,
+                       0x40C00000, 2"  />
 
     <!--MTP boost-->
         <!-- SCHEDBOOST resource opcode, value-->
@@ -1087,6 +1090,9 @@
                 Id="0x00001097" Type="0" Enable="true" Timeout="7" Target="yupik" Fps="144"
                 Resources="0x40800000, 1500, 0x42804000, 0, 0x42C20000, 1" />
 
+        <Config
+                Id="0x00001097" Type="0" Enable="true" Timeout="9" Target="yupik" Fps="120"
+                Resources="0x40800000, 1500, 0x42804000, 0, 0x42C20000, 1" />
     <!--Large Comp HInt -->
         <!-- CPU min freq resource opcode, value -->
         <!-- GPU MIN_FREQUENCY resource opcode,value -->
diff --git a/proprietary/vendor/etc/perf/perfconfigstore.xml b/proprietary/vendor/etc/perf/perfconfigstore.xml
index 25217d9..3d1e637 100644
--- a/proprietary/vendor/etc/perf/perfconfigstore.xml
+++ b/proprietary/vendor/etc/perf/perfconfigstore.xml
@@ -55,8 +55,9 @@ ________________________________________________________________________________
                 <Prop Name="ro.vendor.perf.wlc.heavygame" Value="false" Target="yupik" />
                 <Prop Name="ro.vendor.perf.splh" Value="hw" Target="yupik" />
                 <Prop Name="ro.vendor.perf.gplaf" Value="true" Target="yupik" />
-                <Prop Name="ro.vendor.perf.enable.prekill" Value="false" Target="lahaina" />
+                <Prop Name="ro.vendor.perf.enable.prekill" Value="false" />
                 <Prop Name="ro.vendor.perf.splh" Value="none" Target="lahaina" />
+                <Prop Name="ro.vendor.perf.gplaf" Value="false" Target="lahaina" />
 
                 <!--System Properties -->
                 <Prop Name="ro.lmk.kill_heaviest_task_dup" Value="true" />
diff --git a/proprietary/vendor/etc/powerhint.xml b/proprietary/vendor/etc/powerhint.xml
index 6330aa9..963be09 100644
--- a/proprietary/vendor/etc/powerhint.xml
+++ b/proprietary/vendor/etc/powerhint.xml
@@ -28,6 +28,42 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+ /*
+ *  Changes from Qualcomm Innovation Center are provided under the following license:
+ *
+ *  Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted (subject to the limitations in the
+ *  disclaimer below) provided that the following conditions are met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *        notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials provided
+ *        with the distribution.
+ *
+ *      * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+ *        contributors may be used to endorse or promote products derived
+ *        from this software without specific prior written permission.
+ *
+ *  NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ *  GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ *  HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ *  IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ *  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 -->
 <HintConfigs>
     <Powerhint>
@@ -225,69 +261,69 @@
         <!--CPU-LLC BWMON - Set sample_ms 33-->
         <!--CPU-LLC BWMON - Set io_percent 100 -->
         <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
-		<!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
         <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
         <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
         <!--L CPU - Disable schedutil PL -->
         <!--L CPU - Set hispeed load 99 -->
-		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
-		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
+        <!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
+        <!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
         <Config
             Id="0x00001330" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
+            Resources="0x4183C000, 0x21, 0x41834000, 0x64, 0x41838000, 0, 0x43034000, 0x21, 0x43020000, 0x64, 0x43024000, 0, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
 
 
         <!--camera 30fps-->
         <!--CPU-LLC BWMON - Set sample_ms 33 -->
         <!--CPU-LLC BWMON - Set io_percent 100 -->
         <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
-		<!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
         <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
         <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
-		<!--L CPU min freq 998400 -->
+        <!--L CPU min freq 998400 -->
         <!--L CPU - Disable schedutil PL -->
         <!--L CPU - Set hispeed load 99 -->
-		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
-		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
+        <!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
+        <!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
     <!--Set sched_prefer_spread to 2 -->
     <!--Set sched_boost to 2 -->
         <Config
             Id="0x00001331" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x3E6, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8, 0x40CA8000, 0x2, 0x40C00000, 0x2"/>
+            Resources="0x4183C000, 0x21, 0x41834000, 0x64, 0x41838000, 0, 0x43034000, 0x21, 0x43020000, 0x64, 0x43024000, 0, 0x40800100, 0x3E6, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8, 0x40CA8000, 0x2, 0x40C00000, 0x2"/>
 
         <!--camera 60fps-->
         <!--CPU-LLC BWMON - Set sample_ms 16 -->
         <!--CPU-LLC BWMON - Set io_percent 100 -->
         <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
-		<!--CPU-LLC-DDR BWMON - Set sample_ms 16 -->
+        <!--CPU-LLC-DDR BWMON - Set sample_ms 16 -->
         <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
         <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
-		<!--L CPU min freq 1209600 -->
+        <!--L CPU min freq 1209600 -->
         <!--L CPU - Disable schedutil PL -->
         <!--L CPU - Set hispeed load 99 -->
-		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
-		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
+        <!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
+        <!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
         <!--Set sched_prefer_spread to 2  -->
         <!--Set sched_boost to 2 -->
         <Config
             Id="0x00001332" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x41820000, 0x10, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x10, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8, 0x40CA8000, 0x2, 0x40C00000, 0x2"/>
+            Resources="0x4183C000, 0x10, 0x41834000, 0x64, 0x41838000, 0, 0x43034000, 0x21, 0x43020000, 0x64, 0x43024000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8, 0x40CA8000, 0x2, 0x40C00000, 0x2"/>
 
         <!--camera 8k30-->
         <!--CPU-LLC BWMON - Set sample_ms 33 -->
         <!--CPU-LLC BWMON - Set io_percent 100 -->
         <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
-		<!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
         <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
         <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
-		<!--L CPU min freq 1209600 -->
+        <!--L CPU min freq 1209600 -->
         <!--L CPU - Disable schedutil PL -->
         <!--L CPU - Set hispeed load 99 -->
-		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
-		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
+        <!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
+        <!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
         <Config
             Id="0x00001335" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8"/>
+            Resources="0x4183C000, 0x21, 0x41834000, 0x64, 0x41838000, 0, 0x43034000, 0x21, 0x43020000, 0x64, 0x43024000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8"/>
 
         <!--video encode HFR fps-->
         <!--MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1-->
@@ -315,7 +351,7 @@
         <!--CPU-LLC BWMON - Set hyst_length hyst_trigger hist memory 0 -->
         <Config
             Id="0x00001334" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x40400000, 0x1, 0x40800100, 0x40C, 0x40800000, 0x4CC, 0x40C20000, 0x14, 0x40C1C000, 0x1E, 0x41820000, 0x0A, 0x41808000, 0x50, 0x4180C000, 0"/>
+            Resources="0x40400000, 0x1, 0x40800100, 0x40C, 0x40800000, 0x4CC, 0x40C20000, 0x14, 0x40C1C000, 0x1E, 0x4183C000, 0x0A, 0x41834000, 0x50, 0x41838000, 0"/>
 
         <!--camera 30FPS SHDR-->
         <!--CPU-LLC BWMON - Set sample_ms 33 -->
@@ -331,7 +367,7 @@
         <!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
         <Config
             Id="0x00001337" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x3E6, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
+            Resources="0x4183C000, 0x21, 0x41834000, 0x64, 0x41838000, 0, 0x43034000, 0x21, 0x43020000, 0x64, 0x43024000, 0, 0x40800100, 0x3E6, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
 
         <!--camera preview -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
diff --git a/proprietary/vendor/etc/qcril_database/qcrilNr.db b/proprietary/vendor/etc/qcril_database/qcrilNr.db
index 7402437..e14ca13 100644
Binary files a/proprietary/vendor/etc/qcril_database/qcrilNr.db and b/proprietary/vendor/etc/qcril_database/qcrilNr.db differ
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/config/10.0_config.sql b/proprietary/vendor/etc/qcril_database/upgrade/config/10.0_config.sql
index d1f59e2..15dea6a 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/config/10.0_config.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/config/10.0_config.sql
@@ -6,7 +6,6 @@
 */
 
 CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT PRIMARY KEY NOT NULL, def_val TEXT, value TEXT);
-INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES('qcrildb_version',10.0);
-UPDATE qcril_properties_table SET def_val="" WHERE property="all_bc_msg";
+UPDATE qcril_properties_table set def_val='10' where property='qcrildb_version';UPDATE qcril_properties_table SET def_val="" WHERE property="all_bc_msg";
 UPDATE qcril_properties_table SET def_val="1" WHERE property="persist.vendor.radio.custom_ecc";
 UPDATE qcril_properties_table SET def_val="1" WHERE property="persist.vendor.radio.cs_srv_type";
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql b/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql
index 16e02d0..9cd334e 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql
@@ -5,8 +5,7 @@
 */
 
 CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT PRIMARY KEY NOT NULL, def_val TEXT, value TEXT);
-INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES('qcrildb_version',6.0);
-INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("is_rat_tlv_supported", "1");
+UPDATE qcril_properties_table set def_val='6' where property='qcrildb_version';INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("is_rat_tlv_supported", "1");
 INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("is_ril_vrte_learning_enabled", "0");
 INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("all_bc_msg", "all");
 INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("hw_mbn_loaded", "0");
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql b/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql
index 07d6fd9..fa959e0 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql
@@ -6,8 +6,7 @@
 */
 
 CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT PRIMARY KEY NOT NULL, def_val TEXT, value TEXT);
-INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES('qcrildb_version',9.0);
-UPDATE qcril_properties_table SET def_val="" WHERE property="all_bc_msg";
+UPDATE qcril_properties_table set def_val='9' where property='qcrildb_version';UPDATE qcril_properties_table SET def_val="" WHERE property="all_bc_msg";
 UPDATE qcril_properties_table SET def_val="false" WHERE property="persist.vendor.radio.do_not_use_ril_optr_db";
 INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES("persist.vendor.radio.shutdown_deactivate_timer", "90");
 UPDATE qcril_properties_table SET def_val="1" WHERE property="persist.vendor.radio.qcril_uim_vcc_feature";
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/0_initial.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/0_initial.sql
index 7830651..722640e 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/0_initial.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/0_initial.sql
@@ -6,232 +6,231 @@
 
 -- VERSION: 1
 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('730','133','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('901','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('901','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('404','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','191','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1669','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','199','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','112','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','911','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('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','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','119','','');
-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('405','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','*272911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','*272*911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','*272#911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('311','*272911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('311','*272*911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('311','*272#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','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','100','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','101','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','102','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','108','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','100','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','101','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','102','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','108','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('234','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('722','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('722','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('505','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('505','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('505','000','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('724','190','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('724','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('724','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('001','190','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('001','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('001','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('730','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('730','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('732','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('732','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('712','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('712','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('712','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('712','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('712','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('740','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('740','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('740','101','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('706','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('706','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('706','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('706','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('372','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('372','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('338','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('338','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('272','911','','');
-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('334','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('334','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('710','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('710','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('710','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('710','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('710','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('714','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('714','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('714','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('714','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('714','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('744','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('744','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('716','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('716','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('330','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('330','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('374','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('374','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('234','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('234','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('748','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('748','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','100','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('404','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('405','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('730','133','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('901','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('901','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('404','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('520','191','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('520','1669','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('520','199','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('520','112','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('520','911','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('414','191','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('414','192','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('414','199','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('515','117','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('515','112','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('515','911','','limited');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('460','110','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('460','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('460','120','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('460','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('460','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('852','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('510','110','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('510','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('510','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('510','199','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('510','113','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('510','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('452','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('452','113','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('452','114','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('452','115','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('502','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('502','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('502','991','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('502','994','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('502','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('405','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('310','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('310','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('310','*272911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('310','*272*911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('310','*272#911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('311','*272911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('311','*272*911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('311','*272#911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('302','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('302','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('456','191','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('456','192','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('456','199','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('457','191','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('457','192','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('457','199','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('706','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('704','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('429','100','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('429','101','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('429','102','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('429','108','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('429','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('470','100','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('470','101','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('470','102','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('470','108','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('470','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('234','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('722','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('722','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('505','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('505','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('505','000','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('724','190','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('724','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('724','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('001','190','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('001','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('001','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('730','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('730','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('732','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('732','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('712','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('712','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('712','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('712','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('712','115','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('740','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('740','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('740','101','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('706','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('706','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('706','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('706','115','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('704','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('372','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('372','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('338','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('338','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('272','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('272','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('272','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('334','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('334','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('710','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('710','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('710','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('710','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('710','115','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('714','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('714','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('714','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('714','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('714','115','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('744','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('744','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('716','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('716','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('330','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('330','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('374','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('374','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('234','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('234','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('748','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('748','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('425','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('425','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('425','100','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('510','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('404','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('405','911','','');
 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','119','','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');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('460','110','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('460','119','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('460','120','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('460','112','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('460','999','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('852','999','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('460','122','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('520','191','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('520','1669','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('520','199','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('520','112','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('520','911','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('414','191','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('414','192','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('414','199','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('515','117','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('515','112','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('515','911','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('510','110','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('510','118','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('510','119','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('510','199','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('510','113','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('510','112','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('452','112','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('452','113','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('452','114','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('452','115','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('502','112','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('502','911','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('502','991','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('502','994','','full');
+INSERT OR REPLACE  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));
 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('732','123','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('510','10','115','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','103','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','115','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','120','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','122','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','128','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','66','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','10','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('734','04','*1','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','115','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','128','','');
-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('00','000','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','000','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','08','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','110','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','119','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','*911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','#911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','06','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','111','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','01','119','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','01','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','120','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','122','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','*171','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','01','171','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','02','171','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','03','171','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','06','*1','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','06','*171','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','06','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','06','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','12','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','187','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','130','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('268','06','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('268','06','911','','');
-CREATE TABLE qcril_properties_table (property TEXT,value TEXT, PRIMARY KEY(property));
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','123','123','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('510','10','115','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','103','123','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','115','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','120','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','128','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','66','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','10','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','10','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','*1','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','115','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','128','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','07','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','07','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','000','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','08','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','110','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','190','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','*911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('00','000','#911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','105','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','06','105','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','111','123','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','01','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','01','999','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','01','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','120','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','*171','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','01','171','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','02','171','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','03','171','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','06','*1','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','06','*171','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','06','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','06','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','12','123','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','187','123','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','130','123','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('268','06','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('268','06','911','','');
+CREATE TABLE qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
 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));
 CREATE TABLE qcril_operator_specific_config(MCC TEXT, MNC TEXT, WPS_OVER_CS INTEGER, PRIMARY KEY(MCC, MNC));
-INSERT INTO "qcril_properties_table" VALUES('qcrildb_version','3');
-COMMIT;
+INSERT INTO "qcril_properties_table" VALUES('qcrildb_version','1','3');
\ No newline at end of file
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/10_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/10_version_qcrildb.sql
index 5ca5e3a..e255f69 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/10_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/10_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 10);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='10' where property='qcrildb_version';
 
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('310','730',1);
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('311','220',1);
@@ -26,6 +25,5 @@ INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('311','587',1);
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('311','588',1);
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('311','589',1);
 
-COMMIT TRANSACTION;
 
 
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/11_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/11_version_qcrildb.sql
index fa3b784..21f760e 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/11_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/11_version_qcrildb.sql
@@ -1,11 +1,9 @@
-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', 11);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='11' where property='qcrildb_version';
 
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '704' AND MNC = '01';
 
-COMMIT TRANSACTION;
 
 
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/12_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/12_version_qcrildb.sql
index 3305d30..0f5482b 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/12_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/12_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 12);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='12' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','30','112','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','30','999','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','33','112','','');
@@ -20,6 +19,5 @@ INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('242','02',
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('242','05','911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('242','05','112','','');
 
-COMMIT TRANSACTION;
 
 
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/13_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/13_version_qcrildb.sql
index 818fae0..1143442 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/13_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/13_version_qcrildb.sql
@@ -1,12 +1,10 @@
-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', 13);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='13' where property='qcrildb_version';
 
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '222' AND MNC = '88';
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '222' AND MNC = '99';
 
-COMMIT TRANSACTION;
 
 
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/14_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/14_version_qcrildb.sql
index d9a184f..ee895db 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/14_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/14_version_qcrildb.sql
@@ -4,10 +4,8 @@
   Confidential and Proprietary - Qualcomm Technologies, Inc.
 */
 
-BEGIN TRANSACTION;
-
-INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 14);
 
+UPDATE qcril_properties_table set value='14' where property='qcrildb_version';
 DELETE FROM qcril_operator_specific_config where MCC = '310' AND MNC = '730';
 DELETE FROM qcril_operator_specific_config where MCC = '311' AND MNC = '220';
 DELETE FROM qcril_operator_specific_config where MCC = '311' AND MNC = '221';
@@ -30,4 +28,3 @@ DELETE FROM qcril_operator_specific_config where MCC = '311' AND MNC = '587';
 DELETE FROM qcril_operator_specific_config where MCC = '311' AND MNC = '588';
 DELETE FROM qcril_operator_specific_config where MCC = '311' AND MNC = '589';
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/15_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/15_version_qcrildb.sql
index 78cee88..07e731b 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/15_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/15_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 15);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='15' where property='qcrildb_version';
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '222' AND MNC = '88';
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '222' AND MNC = '99';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','88','112','','');
@@ -10,4 +9,3 @@ INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','88',
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99','112','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99','911','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/16_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/16_version_qcrildb.sql
index ff7a615..f8551cd 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/16_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/16_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 16);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='16' where property='qcrildb_version';
 
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('310','750',1);
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('311','440',1);
@@ -20,6 +19,5 @@ INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('310','960',1);
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('311','050',1);
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('311','650',1);
 
-COMMIT TRANSACTION;
 
 
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/17_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/17_version_qcrildb.sql
index 05e11cc..d423940 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/17_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/17_version_qcrildb.sql
@@ -1,10 +1,8 @@
-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', 17);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='17' where property='qcrildb_version';
 DELETE FROM qcril_emergency_source_voice_table where MCC = '460' AND NUMBER = '112';
 
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('460','911','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/18_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/18_version_qcrildb.sql
index d4b919d..7dcddfa 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/18_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/18_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 18);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='18' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('228','01','117','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('228','01','118','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('228','01','143','','');
@@ -10,4 +9,3 @@ INSERT OR REPLACE INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('228'
 INSERT OR REPLACE INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('228','01','145','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('228','01','147','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/19_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/19_version_qcrildb.sql
index a571f99..17d2529 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/19_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/19_version_qcrildb.sql
@@ -1,13 +1,11 @@
-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', 19);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','110','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','07','110','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','07','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','07','911','','');
+UPDATE qcril_properties_table set value='19' where property='qcrildb_version';
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','110','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','911','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','07','110','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','07','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','07','911','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/20_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/20_version_qcrildb.sql
index 3a18cc0..4533285 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/20_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/20_version_qcrildb.sql
@@ -1,13 +1,11 @@
-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', 20);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','10','110','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','10','118','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','10','119','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','20','110','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','20','118','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','20','119','','');
+UPDATE qcril_properties_table set value='20' where property='qcrildb_version';
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','10','110','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','10','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','10','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','20','110','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','20','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('440','20','119','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/21_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/21_version_qcrildb.sql
index e121823..090603a 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/21_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/21_version_qcrildb.sql
@@ -1,9 +1,7 @@
-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', 21);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','360','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','123','','');
+UPDATE qcril_properties_table set value='21' where property='qcrildb_version';
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','360','123','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','123','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/22_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/22_version_qcrildb.sql
index 09b3354..85186a4 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/22_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/22_version_qcrildb.sql
@@ -1,10 +1,8 @@
-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', 22);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='22' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('310','240','*911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('310','240','#911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','870','*911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','870','#911','','');
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/23_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/23_version_qcrildb.sql
index 2c231dc..30de09e 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/23_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/23_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 23);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='23' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('219','10','112','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('219','10','911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('232','01','112','','');
@@ -11,4 +10,3 @@ INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('240','01',
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('240','01','911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('240','07','112','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('240','07','911','','');
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/24_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/24_version_qcrildb.sql
index f9d3925..024a06b 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/24_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/24_version_qcrildb.sql
@@ -1,11 +1,9 @@
-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', 24);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='24' where property='qcrildb_version';
 
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '732' AND MNC = '101';
 
-COMMIT TRANSACTION;
 
 
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/25_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/25_version_qcrildb.sql
index 735e09b..8b57b98 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/25_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/25_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 25);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='25' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('310','730','*272911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('310','240','*272911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','580','*272911','','');
@@ -27,4 +26,3 @@ INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','588'
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','589','*272911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','870','*272911','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/26_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/26_version_qcrildb.sql
index ae4b99b..49378bd 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/26_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/26_version_qcrildb.sql
@@ -1,8 +1,6 @@
-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', 26);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='26' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_operator_specific_config" VALUES('311','840',1);
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/27_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/27_version_qcrildb.sql
index ddefa0f..7f517a7 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/27_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/27_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 27);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='27' where property='qcrildb_version';
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '708' AND MNC = '001';
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '706' AND MNC = '01';
 DELETE FROM qcril_emergency_source_mcc_table where MCC = '706' AND NUMBER = '122';
@@ -12,4 +11,3 @@ INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04',
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04','118','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04','115','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/28_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/28_version_qcrildb.sql
index 7052913..a7e7c9f 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/28_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/28_version_qcrildb.sql
@@ -1,11 +1,9 @@
-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', 28);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='28' where property='qcrildb_version';
 DELETE FROM qcril_emergency_source_mcc_table where MCC = '706' AND NUMBER = '133';
 
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','112','','');
 
-COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/29_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/29_version_qcrildb.sql
index b181993..e4b09d5 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/29_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/29_version_qcrildb.sql
@@ -1,12 +1,7 @@
-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', 29);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='29' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','06','911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','10','911','','');
 
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('466','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('466','119','','');
-
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/30_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/30_version_qcrildb.sql
index 210ef3b..d8ef998 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/30_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/30_version_qcrildb.sql
@@ -1,231 +1,229 @@
-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', 30);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','116117','','');
+UPDATE qcril_properties_table set value='30' where property='qcrildb_version';
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','01','116117','','');
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','02','116117','','');
 
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','91','116117','','');
 
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','20','116117','','');
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','21','116117','','');
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','88','116117','','');
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','09','116117','','');
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','10','116117','','');
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','11','116117','','');
 
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','15','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','17','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','18','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','115','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','119','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','191','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','196','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','197','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','116000','','');
-INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_mcc_mnc_table VALUES('208','13','116117','','');
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','01','116117','','');
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','02','116117','','');
 
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','91','116117','','');
 
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','20','116117','','');
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','21','116117','','');
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','88','116117','','');
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','09','116117','','');
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','10','116117','','');
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','11','116117','','');
 
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','15','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','17','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','18','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','115','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','119','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','191','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','196','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','197','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','116000','','');
-INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','116117','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','15','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','17','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','18','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','115','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','119','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','191','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','196','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','197','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','116000','','');
+INSERT OR REPLACE  INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('208','13','116117','','');
 
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/3_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/3_version_qcrildb.sql
index eb0e640..489c94d 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/3_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/3_version_qcrildb.sql
@@ -1,9 +1,7 @@
-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', 3);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='3' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('268','06','112','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('268','06','911','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql
index b062ec3..d0628dc 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 4);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='4' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','88','000','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','88','08','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','88','110','','');
@@ -20,4 +19,3 @@ INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99',
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99','911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99','999','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql
index 8e4f633..bc4104d 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql
@@ -1,11 +1,9 @@
-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', 5);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='5' where property='qcrildb_version';
 DELETE FROM qcril_emergency_source_mcc_table where MCC = '310' AND NUMBER = '*272*911';
 DELETE FROM qcril_emergency_source_mcc_table where MCC = '310' AND NUMBER = '*272#911';
 DELETE FROM qcril_emergency_source_mcc_table where MCC = '311' AND NUMBER = '*272*911';
 DELETE FROM qcril_emergency_source_mcc_table where MCC = '311' AND NUMBER = '*272#911';
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/6_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/6_version_qcrildb.sql
index 043a281..c3659d9 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/6_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/6_version_qcrildb.sql
@@ -1,9 +1,7 @@
-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', 6);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='6' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('525','999','','full');
 INSERT OR REPLACE INTO "qcril_emergency_source_voice_table" VALUES('525','995','','full');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/7_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/7_version_qcrildb.sql
index b6e2ec5..3adb204 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/7_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/7_version_qcrildb.sql
@@ -1,11 +1,9 @@
-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', 7);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='7' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','580','*911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','580','#911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('310','730','*911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('310','730','#911','','');
 
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/8_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/8_version_qcrildb.sql
index 558c597..862f058 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/8_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/8_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 8);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='8' where property='qcrildb_version';
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','220','*911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','220','#911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','221','*911','','');
@@ -41,4 +40,3 @@ INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','588'
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','588','#911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','589','*911','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('311','589','#911','','');
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/9_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/9_version_qcrildb.sql
index 5a63ac7..32cc56d 100644
--- a/proprietary/vendor/etc/qcril_database/upgrade/ecc/9_version_qcrildb.sql
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/9_version_qcrildb.sql
@@ -1,8 +1,7 @@
-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', 9);
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
 
+UPDATE qcril_properties_table set value='9' where property='qcrildb_version';
 
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '370' AND MNC = '02';
 DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '704' AND MNC = '01';
@@ -34,6 +33,5 @@ INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73',
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','103','','');
 INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','104','','');
 
-COMMIT TRANSACTION;
 
 
diff --git a/proprietary/vendor/firmware/a615_zap.b01 b/proprietary/vendor/firmware/a615_zap.b01
index 6ab0b5a..1c78d53 100644
Binary files a/proprietary/vendor/firmware/a615_zap.b01 and b/proprietary/vendor/firmware/a615_zap.b01 differ
diff --git a/proprietary/vendor/firmware/a615_zap.elf b/proprietary/vendor/firmware/a615_zap.elf
index a388a16..df38161 100644
Binary files a/proprietary/vendor/firmware/a615_zap.elf and b/proprietary/vendor/firmware/a615_zap.elf differ
diff --git a/proprietary/vendor/firmware/a615_zap.mdt b/proprietary/vendor/firmware/a615_zap.mdt
index be065e3..8e5d5ee 100644
Binary files a/proprietary/vendor/firmware/a615_zap.mdt and b/proprietary/vendor/firmware/a615_zap.mdt differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b01 b/proprietary/vendor/firmware/vpu20_2v.b01
index 5db3798..f993ed7 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b01 and b/proprietary/vendor/firmware/vpu20_2v.b01 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b02 b/proprietary/vendor/firmware/vpu20_2v.b02
index ddb87ab..6a8a373 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b02 and b/proprietary/vendor/firmware/vpu20_2v.b02 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b04 b/proprietary/vendor/firmware/vpu20_2v.b04
index 23f6683..cad5a45 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b04 and b/proprietary/vendor/firmware/vpu20_2v.b04 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b09 b/proprietary/vendor/firmware/vpu20_2v.b09
index 83418a4..5bb26ad 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b09 and b/proprietary/vendor/firmware/vpu20_2v.b09 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.b10 b/proprietary/vendor/firmware/vpu20_2v.b10
index 040b9a8..5634640 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.b10 and b/proprietary/vendor/firmware/vpu20_2v.b10 differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.mbn b/proprietary/vendor/firmware/vpu20_2v.mbn
index 1b59881..f2135b5 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.mbn and b/proprietary/vendor/firmware/vpu20_2v.mbn differ
diff --git a/proprietary/vendor/firmware/vpu20_2v.mdt b/proprietary/vendor/firmware/vpu20_2v.mdt
index ac006eb..beb2f54 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v.mdt and b/proprietary/vendor/firmware/vpu20_2v.mdt differ
diff --git a/proprietary/vendor/firmware/vpu20_2v_unsigned.mbn b/proprietary/vendor/firmware/vpu20_2v_unsigned.mbn
index e921251..3e53f1e 100644
Binary files a/proprietary/vendor/firmware/vpu20_2v_unsigned.mbn and b/proprietary/vendor/firmware/vpu20_2v_unsigned.mbn differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b01 b/proprietary/vendor/firmware/vpu20_4v.b01
index d7e2a80..f35b8e8 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b01 and b/proprietary/vendor/firmware/vpu20_4v.b01 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b02 b/proprietary/vendor/firmware/vpu20_4v.b02
index 73406c9..0914140 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b02 and b/proprietary/vendor/firmware/vpu20_4v.b02 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b04 b/proprietary/vendor/firmware/vpu20_4v.b04
index 4fbb405..6861818 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b04 and b/proprietary/vendor/firmware/vpu20_4v.b04 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b09 b/proprietary/vendor/firmware/vpu20_4v.b09
index 4380ee7..ec9eec1 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b09 and b/proprietary/vendor/firmware/vpu20_4v.b09 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.b10 b/proprietary/vendor/firmware/vpu20_4v.b10
index fef38f3..3e0bb36 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.b10 and b/proprietary/vendor/firmware/vpu20_4v.b10 differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.mbn b/proprietary/vendor/firmware/vpu20_4v.mbn
index 8c27535..5e6734d 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.mbn and b/proprietary/vendor/firmware/vpu20_4v.mbn differ
diff --git a/proprietary/vendor/firmware/vpu20_4v.mdt b/proprietary/vendor/firmware/vpu20_4v.mdt
index 91e6667..6d9b7f6 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v.mdt and b/proprietary/vendor/firmware/vpu20_4v.mdt differ
diff --git a/proprietary/vendor/firmware/vpu20_4v_unsigned.mbn b/proprietary/vendor/firmware/vpu20_4v_unsigned.mbn
index ccf0b2c..eaba649 100644
Binary files a/proprietary/vendor/firmware/vpu20_4v_unsigned.mbn and b/proprietary/vendor/firmware/vpu20_4v_unsigned.mbn differ
diff --git a/proprietary/vendor/lib/btaudio_offload_if.so b/proprietary/vendor/lib/btaudio_offload_if.so
index 90f5066..95ebc94 100644
Binary files a/proprietary/vendor/lib/btaudio_offload_if.so and b/proprietary/vendor/lib/btaudio_offload_if.so differ
diff --git a/proprietary/vendor/lib/egl/libGLESv2_adreno.so b/proprietary/vendor/lib/egl/libGLESv2_adreno.so
index 8e34571..4f7182d 100644
Binary files a/proprietary/vendor/lib/egl/libGLESv2_adreno.so and b/proprietary/vendor/lib/egl/libGLESv2_adreno.so differ
diff --git a/proprietary/vendor/lib/egl/libq3dtools_esx.so b/proprietary/vendor/lib/egl/libq3dtools_esx.so
index 6115047..de2cb87 100644
Binary files a/proprietary/vendor/lib/egl/libq3dtools_esx.so and b/proprietary/vendor/lib/egl/libq3dtools_esx.so differ
diff --git a/proprietary/vendor/lib/hw/audio.bluetooth_qti.default.so b/proprietary/vendor/lib/hw/audio.bluetooth_qti.default.so
index 1035b58..3f0882b 100644
Binary files a/proprietary/vendor/lib/hw/audio.bluetooth_qti.default.so and b/proprietary/vendor/lib/hw/audio.bluetooth_qti.default.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
index 6114845..e0e83bc 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
index 5650227..560572c 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vulkan.adreno.so b/proprietary/vendor/lib/hw/vulkan.adreno.so
index 2047497..07cee5e 100644
Binary files a/proprietary/vendor/lib/hw/vulkan.adreno.so and b/proprietary/vendor/lib/hw/vulkan.adreno.so differ
diff --git a/proprietary/vendor/lib/libCB.so b/proprietary/vendor/lib/libCB.so
index 5ff8f19..1cc7115 100644
Binary files a/proprietary/vendor/lib/libCB.so and b/proprietary/vendor/lib/libCB.so differ
diff --git a/proprietary/vendor/lib/libOmxAacDec.so b/proprietary/vendor/lib/libOmxAacDec.so
index edc9cd0..aecb40d 100644
Binary files a/proprietary/vendor/lib/libOmxAacDec.so and b/proprietary/vendor/lib/libOmxAacDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAlacDec.so b/proprietary/vendor/lib/libOmxAlacDec.so
index 8bdcad3..d1afe99 100644
Binary files a/proprietary/vendor/lib/libOmxAlacDec.so and b/proprietary/vendor/lib/libOmxAlacDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAmrDec.so b/proprietary/vendor/lib/libOmxAmrDec.so
index 50a2cb0..8879352 100644
Binary files a/proprietary/vendor/lib/libOmxAmrDec.so and b/proprietary/vendor/lib/libOmxAmrDec.so differ
diff --git a/proprietary/vendor/lib/libOmxAmrwbplusDec.so b/proprietary/vendor/lib/libOmxAmrwbplusDec.so
index 7b486b7..58eab31 100644
Binary files a/proprietary/vendor/lib/libOmxAmrwbplusDec.so and b/proprietary/vendor/lib/libOmxAmrwbplusDec.so differ
diff --git a/proprietary/vendor/lib/libOmxApeDec.so b/proprietary/vendor/lib/libOmxApeDec.so
index f3d9428..c2d2c20 100644
Binary files a/proprietary/vendor/lib/libOmxApeDec.so and b/proprietary/vendor/lib/libOmxApeDec.so differ
diff --git a/proprietary/vendor/lib/libOmxG711Dec.so b/proprietary/vendor/lib/libOmxG711Dec.so
index 6f92808..b4335ab 100644
Binary files a/proprietary/vendor/lib/libOmxG711Dec.so and b/proprietary/vendor/lib/libOmxG711Dec.so differ
diff --git a/proprietary/vendor/lib/libOmxMpeghDecSw.so b/proprietary/vendor/lib/libOmxMpeghDecSw.so
index edd5e73..a4a9a80 100644
Binary files a/proprietary/vendor/lib/libOmxMpeghDecSw.so and b/proprietary/vendor/lib/libOmxMpeghDecSw.so differ
diff --git a/proprietary/vendor/lib/libOmxQcelp13Dec.so b/proprietary/vendor/lib/libOmxQcelp13Dec.so
index 6e0ee4e..1450392 100644
Binary files a/proprietary/vendor/lib/libOmxQcelp13Dec.so and b/proprietary/vendor/lib/libOmxQcelp13Dec.so differ
diff --git a/proprietary/vendor/lib/libOmxWmaDec.so b/proprietary/vendor/lib/libOmxWmaDec.so
index bf8043b..121aa62 100644
Binary files a/proprietary/vendor/lib/libOmxWmaDec.so and b/proprietary/vendor/lib/libOmxWmaDec.so differ
diff --git a/proprietary/vendor/lib/libVkLayer_q3dtools.so b/proprietary/vendor/lib/libVkLayer_q3dtools.so
index 9092351..3787a72 100644
Binary files a/proprietary/vendor/lib/libVkLayer_q3dtools.so and b/proprietary/vendor/lib/libVkLayer_q3dtools.so differ
diff --git a/proprietary/vendor/lib/libacdb-fts.so b/proprietary/vendor/lib/libacdb-fts.so
index d409598..f56e016 100644
Binary files a/proprietary/vendor/lib/libacdb-fts.so and b/proprietary/vendor/lib/libacdb-fts.so differ
diff --git a/proprietary/vendor/lib/libacdbrtac.so b/proprietary/vendor/lib/libacdbrtac.so
index e51ead7..86f0a90 100644
Binary files a/proprietary/vendor/lib/libacdbrtac.so and b/proprietary/vendor/lib/libacdbrtac.so differ
diff --git a/proprietary/vendor/lib/libadiertac.so b/proprietary/vendor/lib/libadiertac.so
index 2957bf8..24f882c 100644
Binary files a/proprietary/vendor/lib/libadiertac.so and b/proprietary/vendor/lib/libadiertac.so differ
diff --git a/proprietary/vendor/lib/libadreno_app_profiles.so b/proprietary/vendor/lib/libadreno_app_profiles.so
index aee6269..dadf6d1 100644
Binary files a/proprietary/vendor/lib/libadreno_app_profiles.so and b/proprietary/vendor/lib/libadreno_app_profiles.so differ
diff --git a/proprietary/vendor/lib/libadreno_utils.so b/proprietary/vendor/lib/libadreno_utils.so
index 85fe2bf..cf5d7c1 100644
Binary files a/proprietary/vendor/lib/libadreno_utils.so and b/proprietary/vendor/lib/libadreno_utils.so differ
diff --git a/proprietary/vendor/lib/libadsprpc.so b/proprietary/vendor/lib/libadsprpc.so
index 979dcf9..b35c8b3 100644
Binary files a/proprietary/vendor/lib/libadsprpc.so and b/proprietary/vendor/lib/libadsprpc.so differ
diff --git a/proprietary/vendor/lib/libaudcal.so b/proprietary/vendor/lib/libaudcal.so
index 525a3ca..9a0baf7 100644
Binary files a/proprietary/vendor/lib/libaudcal.so and b/proprietary/vendor/lib/libaudcal.so differ
diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so
index d85f05e..8971037 100644
Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so differ
diff --git a/proprietary/vendor/lib/libcdsprpc.so b/proprietary/vendor/lib/libcdsprpc.so
index 0731252..32a2efc 100644
Binary files a/proprietary/vendor/lib/libcdsprpc.so and b/proprietary/vendor/lib/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib/libdiag.so b/proprietary/vendor/lib/libdiag.so
index d5ebe67..f7d61d9 100644
Binary files a/proprietary/vendor/lib/libdiag.so and b/proprietary/vendor/lib/libdiag.so differ
diff --git a/proprietary/vendor/lib/libdsi_netctrl.so b/proprietary/vendor/lib/libdsi_netctrl.so
index c5a2b87..85023e7 100644
Binary files a/proprietary/vendor/lib/libdsi_netctrl.so and b/proprietary/vendor/lib/libdsi_netctrl.so differ
diff --git a/proprietary/vendor/lib/libgcs-calwrapper.so b/proprietary/vendor/lib/libgcs-calwrapper.so
index 84cfad1..1117175 100644
Binary files a/proprietary/vendor/lib/libgcs-calwrapper.so and b/proprietary/vendor/lib/libgcs-calwrapper.so differ
diff --git a/proprietary/vendor/lib/libgcs-ipc.so b/proprietary/vendor/lib/libgcs-ipc.so
index 708ea26..dede6ed 100644
Binary files a/proprietary/vendor/lib/libgcs-ipc.so and b/proprietary/vendor/lib/libgcs-ipc.so differ
diff --git a/proprietary/vendor/lib/libgcs.so b/proprietary/vendor/lib/libgcs.so
index 781ca86..969500f 100644
Binary files a/proprietary/vendor/lib/libgcs.so and b/proprietary/vendor/lib/libgcs.so differ
diff --git a/proprietary/vendor/lib/libgpudataproducer.so b/proprietary/vendor/lib/libgpudataproducer.so
index e20d027..f0599d5 100644
Binary files a/proprietary/vendor/lib/libgpudataproducer.so and b/proprietary/vendor/lib/libgpudataproducer.so differ
diff --git a/proprietary/vendor/lib/libgsl.so b/proprietary/vendor/lib/libgsl.so
index 8026f7b..48cdae5 100644
Binary files a/proprietary/vendor/lib/libgsl.so and b/proprietary/vendor/lib/libgsl.so differ
diff --git a/proprietary/vendor/lib/libllvm-glnext.so b/proprietary/vendor/lib/libllvm-glnext.so
index 1a5b4c2..3fee4f3 100644
Binary files a/proprietary/vendor/lib/libllvm-glnext.so and b/proprietary/vendor/lib/libllvm-glnext.so differ
diff --git a/proprietary/vendor/lib/libllvm-qcom.so b/proprietary/vendor/lib/libllvm-qcom.so
index fb43ecd..408ce47 100644
Binary files a/proprietary/vendor/lib/libllvm-qcom.so and b/proprietary/vendor/lib/libllvm-qcom.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_base.so b/proprietary/vendor/lib/libqcodec2_base.so
index bcdbcab..5e6f837 100644
Binary files a/proprietary/vendor/lib/libqcodec2_base.so and b/proprietary/vendor/lib/libqcodec2_base.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_basecodec.so b/proprietary/vendor/lib/libqcodec2_basecodec.so
index 1990f55..7ee32a1 100644
Binary files a/proprietary/vendor/lib/libqcodec2_basecodec.so and b/proprietary/vendor/lib/libqcodec2_basecodec.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_core.so b/proprietary/vendor/lib/libqcodec2_core.so
index 6be9991..53b4cba 100644
Binary files a/proprietary/vendor/lib/libqcodec2_core.so and b/proprietary/vendor/lib/libqcodec2_core.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_platform.so b/proprietary/vendor/lib/libqcodec2_platform.so
index 335f88b..4c22ed2 100644
Binary files a/proprietary/vendor/lib/libqcodec2_platform.so and b/proprietary/vendor/lib/libqcodec2_platform.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_utils.so b/proprietary/vendor/lib/libqcodec2_utils.so
index b8b3880..603c9f8 100644
Binary files a/proprietary/vendor/lib/libqcodec2_utils.so and b/proprietary/vendor/lib/libqcodec2_utils.so differ
diff --git a/proprietary/vendor/lib/libqcodec2_v4l2codec.so b/proprietary/vendor/lib/libqcodec2_v4l2codec.so
index 8776b78..8234027 100644
Binary files a/proprietary/vendor/lib/libqcodec2_v4l2codec.so and b/proprietary/vendor/lib/libqcodec2_v4l2codec.so differ
diff --git a/proprietary/vendor/lib/libqdi.so b/proprietary/vendor/lib/libqdi.so
index c80ed80..83a8022 100644
Binary files a/proprietary/vendor/lib/libqdi.so and b/proprietary/vendor/lib/libqdi.so differ
diff --git a/proprietary/vendor/lib/libqmi.so b/proprietary/vendor/lib/libqmi.so
index b94ec70..8ef5390 100644
Binary files a/proprietary/vendor/lib/libqmi.so and b/proprietary/vendor/lib/libqmi.so differ
diff --git a/proprietary/vendor/lib/libqti-perfd-client.so b/proprietary/vendor/lib/libqti-perfd-client.so
index 7d9cdb7..169f12f 100644
Binary files a/proprietary/vendor/lib/libqti-perfd-client.so and b/proprietary/vendor/lib/libqti-perfd-client.so differ
diff --git a/proprietary/vendor/lib/libqti-perfd.so b/proprietary/vendor/lib/libqti-perfd.so
index 0daed39..2ed05f8 100644
Binary files a/proprietary/vendor/lib/libqti-perfd.so and b/proprietary/vendor/lib/libqti-perfd.so differ
diff --git a/proprietary/vendor/lib/libvppclient.so b/proprietary/vendor/lib/libvppclient.so
index 05c90d8..8c32342 100644
Binary files a/proprietary/vendor/lib/libvppclient.so and b/proprietary/vendor/lib/libvppclient.so differ
diff --git a/proprietary/vendor/lib/libvpplibrary.so b/proprietary/vendor/lib/libvpplibrary.so
index 932c8d5..ea70435 100644
Binary files a/proprietary/vendor/lib/libvpplibrary.so and b/proprietary/vendor/lib/libvpplibrary.so differ
diff --git a/proprietary/vendor/lib/libwfdmminterface_proprietary.so b/proprietary/vendor/lib/libwfdmminterface_proprietary.so
index d1837df..a1f335a 100644
Binary files a/proprietary/vendor/lib/libwfdmminterface_proprietary.so and b/proprietary/vendor/lib/libwfdmminterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/rfsa/adsp/bm2n13.bin b/proprietary/vendor/lib/rfsa/adsp/bm2n13.bin
index 8ce62f5..6c9911c 100644
Binary files a/proprietary/vendor/lib/rfsa/adsp/bm2n13.bin and b/proprietary/vendor/lib/rfsa/adsp/bm2n13.bin differ
diff --git a/proprietary/vendor/lib64/btaudio_offload_if.so b/proprietary/vendor/lib64/btaudio_offload_if.so
index d09c52e..0999cc8 100644
Binary files a/proprietary/vendor/lib64/btaudio_offload_if.so and b/proprietary/vendor/lib64/btaudio_offload_if.so differ
diff --git a/proprietary/vendor/lib64/egl/libGLESv2_adreno.so b/proprietary/vendor/lib64/egl/libGLESv2_adreno.so
index 2ca4a18..5d6c148 100644
Binary files a/proprietary/vendor/lib64/egl/libGLESv2_adreno.so and b/proprietary/vendor/lib64/egl/libGLESv2_adreno.so differ
diff --git a/proprietary/vendor/lib64/egl/libq3dtools_esx.so b/proprietary/vendor/lib64/egl/libq3dtools_esx.so
index ec4ca97..b448ac8 100644
Binary files a/proprietary/vendor/lib64/egl/libq3dtools_esx.so and b/proprietary/vendor/lib64/egl/libq3dtools_esx.so differ
diff --git a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
index aa2a97c..8460baf 100644
Binary files a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so and b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so differ
diff --git a/proprietary/vendor/lib64/hw/audio.bluetooth_qti.default.so b/proprietary/vendor/lib64/hw/audio.bluetooth_qti.default.so
index add317e..6915edf 100644
Binary files a/proprietary/vendor/lib64/hw/audio.bluetooth_qti.default.so and b/proprietary/vendor/lib64/hw/audio.bluetooth_qti.default.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so
index b59d34e..db7d99a 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
index 84b2f6d..54355be 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
index 0dcdd3e..23ba11e 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
index d4c4721..60a6f64 100644
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so and b/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/hw/vulkan.adreno.so b/proprietary/vendor/lib64/hw/vulkan.adreno.so
index b081f3d..cac8a17 100644
Binary files a/proprietary/vendor/lib64/hw/vulkan.adreno.so and b/proprietary/vendor/lib64/hw/vulkan.adreno.so differ
diff --git a/proprietary/vendor/lib64/lib-imsdpl.so b/proprietary/vendor/lib64/lib-imsdpl.so
index b127173..7ce7944 100644
Binary files a/proprietary/vendor/lib64/lib-imsdpl.so and b/proprietary/vendor/lib64/lib-imsdpl.so differ
diff --git a/proprietary/vendor/lib64/lib-imsqimf.so b/proprietary/vendor/lib64/lib-imsqimf.so
index ffee014..53f4383 100644
Binary files a/proprietary/vendor/lib64/lib-imsqimf.so and b/proprietary/vendor/lib64/lib-imsqimf.so differ
diff --git a/proprietary/vendor/lib64/lib-imsvtcore.so b/proprietary/vendor/lib64/lib-imsvtcore.so
index 246004c..f5fdc35 100644
Binary files a/proprietary/vendor/lib64/lib-imsvtcore.so and b/proprietary/vendor/lib64/lib-imsvtcore.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpcommon.so b/proprietary/vendor/lib64/lib-rtpcommon.so
index 3128785..c4084e1 100644
Binary files a/proprietary/vendor/lib64/lib-rtpcommon.so and b/proprietary/vendor/lib64/lib-rtpcommon.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpcore.so b/proprietary/vendor/lib64/lib-rtpcore.so
index a1b2d03..c200b2e 100644
Binary files a/proprietary/vendor/lib64/lib-rtpcore.so and b/proprietary/vendor/lib64/lib-rtpcore.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpsl.so b/proprietary/vendor/lib64/lib-rtpsl.so
index b992448..71423ed 100644
Binary files a/proprietary/vendor/lib64/lib-rtpsl.so and b/proprietary/vendor/lib64/lib-rtpsl.so differ
diff --git a/proprietary/vendor/lib64/libCB.so b/proprietary/vendor/lib64/libCB.so
index 0131209..a1c6211 100644
Binary files a/proprietary/vendor/lib64/libCB.so and b/proprietary/vendor/lib64/libCB.so differ
diff --git a/proprietary/vendor/lib64/libGPQTEEC_vendor.so b/proprietary/vendor/lib64/libGPQTEEC_vendor.so
index cd67360..c3bd72f 100644
Binary files a/proprietary/vendor/lib64/libGPQTEEC_vendor.so and b/proprietary/vendor/lib64/libGPQTEEC_vendor.so differ
diff --git a/proprietary/vendor/lib64/libOmxAacDec.so b/proprietary/vendor/lib64/libOmxAacDec.so
index 77b7911..1e06cd5 100644
Binary files a/proprietary/vendor/lib64/libOmxAacDec.so and b/proprietary/vendor/lib64/libOmxAacDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAlacDec.so b/proprietary/vendor/lib64/libOmxAlacDec.so
index e67b17d..8d0382a 100644
Binary files a/proprietary/vendor/lib64/libOmxAlacDec.so and b/proprietary/vendor/lib64/libOmxAlacDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAmrDec.so b/proprietary/vendor/lib64/libOmxAmrDec.so
index 070b649..f70594b 100644
Binary files a/proprietary/vendor/lib64/libOmxAmrDec.so and b/proprietary/vendor/lib64/libOmxAmrDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so b/proprietary/vendor/lib64/libOmxAmrwbplusDec.so
index 67d2ea2..874206d 100644
Binary files a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so and b/proprietary/vendor/lib64/libOmxAmrwbplusDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxApeDec.so b/proprietary/vendor/lib64/libOmxApeDec.so
index fd9c490..4f58e6a 100644
Binary files a/proprietary/vendor/lib64/libOmxApeDec.so and b/proprietary/vendor/lib64/libOmxApeDec.so differ
diff --git a/proprietary/vendor/lib64/libOmxG711Dec.so b/proprietary/vendor/lib64/libOmxG711Dec.so
index 3392341..f2795d9 100644
Binary files a/proprietary/vendor/lib64/libOmxG711Dec.so and b/proprietary/vendor/lib64/libOmxG711Dec.so differ
diff --git a/proprietary/vendor/lib64/libOmxQcelp13Dec.so b/proprietary/vendor/lib64/libOmxQcelp13Dec.so
index c17fb4d..8fa4d47 100644
Binary files a/proprietary/vendor/lib64/libOmxQcelp13Dec.so and b/proprietary/vendor/lib64/libOmxQcelp13Dec.so differ
diff --git a/proprietary/vendor/lib64/libOmxWmaDec.so b/proprietary/vendor/lib64/libOmxWmaDec.so
index 7533297..6999d14 100644
Binary files a/proprietary/vendor/lib64/libOmxWmaDec.so and b/proprietary/vendor/lib64/libOmxWmaDec.so differ
diff --git a/proprietary/vendor/lib64/libQTEEConnector_vendor.so b/proprietary/vendor/lib64/libQTEEConnector_vendor.so
index e395def..27dd498 100644
Binary files a/proprietary/vendor/lib64/libQTEEConnector_vendor.so and b/proprietary/vendor/lib64/libQTEEConnector_vendor.so differ
diff --git a/proprietary/vendor/lib64/libVkLayer_q3dtools.so b/proprietary/vendor/lib64/libVkLayer_q3dtools.so
index 09e5bd5..67625e3 100644
Binary files a/proprietary/vendor/lib64/libVkLayer_q3dtools.so and b/proprietary/vendor/lib64/libVkLayer_q3dtools.so differ
diff --git a/proprietary/vendor/lib64/libacdb-fts.so b/proprietary/vendor/lib64/libacdb-fts.so
index 417c2db..9bbc495 100644
Binary files a/proprietary/vendor/lib64/libacdb-fts.so and b/proprietary/vendor/lib64/libacdb-fts.so differ
diff --git a/proprietary/vendor/lib64/libacdbrtac.so b/proprietary/vendor/lib64/libacdbrtac.so
index 609458b..91bee87 100644
Binary files a/proprietary/vendor/lib64/libacdbrtac.so and b/proprietary/vendor/lib64/libacdbrtac.so differ
diff --git a/proprietary/vendor/lib64/libadiertac.so b/proprietary/vendor/lib64/libadiertac.so
index 1107ebd..5614ada 100644
Binary files a/proprietary/vendor/lib64/libadiertac.so and b/proprietary/vendor/lib64/libadiertac.so differ
diff --git a/proprietary/vendor/lib64/libadreno_app_profiles.so b/proprietary/vendor/lib64/libadreno_app_profiles.so
index b0126fe..340267e 100644
Binary files a/proprietary/vendor/lib64/libadreno_app_profiles.so and b/proprietary/vendor/lib64/libadreno_app_profiles.so differ
diff --git a/proprietary/vendor/lib64/libadreno_utils.so b/proprietary/vendor/lib64/libadreno_utils.so
index 4cb0b89..68b2ea4 100644
Binary files a/proprietary/vendor/lib64/libadreno_utils.so and b/proprietary/vendor/lib64/libadreno_utils.so differ
diff --git a/proprietary/vendor/lib64/libadsprpc.so b/proprietary/vendor/lib64/libadsprpc.so
index 36bb6cf..5f29f5f 100644
Binary files a/proprietary/vendor/lib64/libadsprpc.so and b/proprietary/vendor/lib64/libadsprpc.so differ
diff --git a/proprietary/vendor/lib64/libaudcal.so b/proprietary/vendor/lib64/libaudcal.so
index 8da8b39..bf5995b 100644
Binary files a/proprietary/vendor/lib64/libaudcal.so and b/proprietary/vendor/lib64/libaudcal.so differ
diff --git a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so
index 87823c1..92e9267 100644
Binary files a/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so and b/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so differ
diff --git a/proprietary/vendor/lib64/libcdsprpc.so b/proprietary/vendor/lib64/libcdsprpc.so
index e2a1766..67ab9e4 100644
Binary files a/proprietary/vendor/lib64/libcdsprpc.so and b/proprietary/vendor/lib64/libcdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libcne.so b/proprietary/vendor/lib64/libcne.so
index 4e40670..6e7b4c5 100644
Binary files a/proprietary/vendor/lib64/libcne.so and b/proprietary/vendor/lib64/libcne.so differ
diff --git a/proprietary/vendor/lib64/libconfigdb.so b/proprietary/vendor/lib64/libconfigdb.so
index c625319..3aaf437 100644
Binary files a/proprietary/vendor/lib64/libconfigdb.so and b/proprietary/vendor/lib64/libconfigdb.so differ
diff --git a/proprietary/vendor/lib64/libdiag.so b/proprietary/vendor/lib64/libdiag.so
index 83c2db0..15fe9b0 100644
Binary files a/proprietary/vendor/lib64/libdiag.so and b/proprietary/vendor/lib64/libdiag.so differ
diff --git a/proprietary/vendor/lib64/libdpps.so b/proprietary/vendor/lib64/libdpps.so
index 2098855..eb568e2 100644
Binary files a/proprietary/vendor/lib64/libdpps.so and b/proprietary/vendor/lib64/libdpps.so differ
diff --git a/proprietary/vendor/lib64/libdsi_netctrl.so b/proprietary/vendor/lib64/libdsi_netctrl.so
index 6ffa773..8d27e43 100644
Binary files a/proprietary/vendor/lib64/libdsi_netctrl.so and b/proprietary/vendor/lib64/libdsi_netctrl.so differ
diff --git a/proprietary/vendor/lib64/libgameoptfeature.so b/proprietary/vendor/lib64/libgameoptfeature.so
index c4d26ba..8b3566d 100644
Binary files a/proprietary/vendor/lib64/libgameoptfeature.so and b/proprietary/vendor/lib64/libgameoptfeature.so differ
diff --git a/proprietary/vendor/lib64/libgcs-calwrapper.so b/proprietary/vendor/lib64/libgcs-calwrapper.so
index 4dbc221..3a1fbd1 100644
Binary files a/proprietary/vendor/lib64/libgcs-calwrapper.so and b/proprietary/vendor/lib64/libgcs-calwrapper.so differ
diff --git a/proprietary/vendor/lib64/libgcs-ipc.so b/proprietary/vendor/lib64/libgcs-ipc.so
index ae25f71..86cf9d7 100644
Binary files a/proprietary/vendor/lib64/libgcs-ipc.so and b/proprietary/vendor/lib64/libgcs-ipc.so differ
diff --git a/proprietary/vendor/lib64/libgcs.so b/proprietary/vendor/lib64/libgcs.so
index 2ce683e..da04542 100644
Binary files a/proprietary/vendor/lib64/libgcs.so and b/proprietary/vendor/lib64/libgcs.so differ
diff --git a/proprietary/vendor/lib64/libgpudataproducer.so b/proprietary/vendor/lib64/libgpudataproducer.so
index bd2dbce..4a3686a 100644
Binary files a/proprietary/vendor/lib64/libgpudataproducer.so and b/proprietary/vendor/lib64/libgpudataproducer.so differ
diff --git a/proprietary/vendor/lib64/libgsl.so b/proprietary/vendor/lib64/libgsl.so
index b2862d4..700e910 100644
Binary files a/proprietary/vendor/lib64/libgsl.so and b/proprietary/vendor/lib64/libgsl.so differ
diff --git a/proprietary/vendor/lib64/libhdr_tm.so b/proprietary/vendor/lib64/libhdr_tm.so
index b7a2a5a..4903fff 100644
Binary files a/proprietary/vendor/lib64/libhdr_tm.so and b/proprietary/vendor/lib64/libhdr_tm.so differ
diff --git a/proprietary/vendor/lib64/liblbs_core.so b/proprietary/vendor/lib64/liblbs_core.so
index e25605b..b118020 100644
Binary files a/proprietary/vendor/lib64/liblbs_core.so and b/proprietary/vendor/lib64/liblbs_core.so differ
diff --git a/proprietary/vendor/lib64/libllvm-glnext.so b/proprietary/vendor/lib64/libllvm-glnext.so
index 23510b6..10b7a5d 100644
Binary files a/proprietary/vendor/lib64/libllvm-glnext.so and b/proprietary/vendor/lib64/libllvm-glnext.so differ
diff --git a/proprietary/vendor/lib64/libllvm-qcom.so b/proprietary/vendor/lib64/libllvm-qcom.so
index 78ddea0..3094957 100644
Binary files a/proprietary/vendor/lib64/libllvm-qcom.so and b/proprietary/vendor/lib64/libllvm-qcom.so differ
diff --git a/proprietary/vendor/lib64/libloc_api_v02.so b/proprietary/vendor/lib64/libloc_api_v02.so
index 2e4d7ee..01fa154 100644
Binary files a/proprietary/vendor/lib64/libloc_api_v02.so and b/proprietary/vendor/lib64/libloc_api_v02.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice.so b/proprietary/vendor/lib64/liblocationservice.so
index 1daef14..2ecfc05 100644
Binary files a/proprietary/vendor/lib64/liblocationservice.so and b/proprietary/vendor/lib64/liblocationservice.so differ
diff --git a/proprietary/vendor/lib64/liblqe.so b/proprietary/vendor/lib64/liblqe.so
index 1e80f44..24d1194 100644
Binary files a/proprietary/vendor/lib64/liblqe.so and b/proprietary/vendor/lib64/liblqe.so differ
diff --git a/proprietary/vendor/lib64/libmdmcutback.so b/proprietary/vendor/lib64/libmdmcutback.so
index 41b6dde..65dfabc 100644
Binary files a/proprietary/vendor/lib64/libmdmcutback.so and b/proprietary/vendor/lib64/libmdmcutback.so differ
diff --git a/proprietary/vendor/lib64/libminksocket.so b/proprietary/vendor/lib64/libminksocket.so
index 3a12f32..0a0b1ae 100644
Binary files a/proprietary/vendor/lib64/libminksocket.so and b/proprietary/vendor/lib64/libminksocket.so differ
diff --git a/proprietary/vendor/lib64/libmotext_inf.so b/proprietary/vendor/lib64/libmotext_inf.so
index 3e585a0..6de8098 100644
Binary files a/proprietary/vendor/lib64/libmotext_inf.so and b/proprietary/vendor/lib64/libmotext_inf.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr.so b/proprietary/vendor/lib64/libnetmgr.so
index 9277f81..82c8e9e 100644
Binary files a/proprietary/vendor/lib64/libnetmgr.so and b/proprietary/vendor/lib64/libnetmgr.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_common.so b/proprietary/vendor/lib64/libnetmgr_common.so
index d4eede7..2132ade 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_common.so and b/proprietary/vendor/lib64/libnetmgr_common.so differ
diff --git a/proprietary/vendor/lib64/libpdmapper.so b/proprietary/vendor/lib64/libpdmapper.so
index b8563f1..8756eed 100644
Binary files a/proprietary/vendor/lib64/libpdmapper.so and b/proprietary/vendor/lib64/libpdmapper.so differ
diff --git a/proprietary/vendor/lib64/libpdnotifier.so b/proprietary/vendor/lib64/libpdnotifier.so
index f9eef0d..b91e0fe 100644
Binary files a/proprietary/vendor/lib64/libpdnotifier.so and b/proprietary/vendor/lib64/libpdnotifier.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNr.so b/proprietary/vendor/lib64/libqcrilNr.so
index 4232630..73b3e70 100644
Binary files a/proprietary/vendor/lib64/libqcrilNr.so and b/proprietary/vendor/lib64/libqcrilNr.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrFramework.so b/proprietary/vendor/lib64/libqcrilNrFramework.so
index 5162baf..59459dd 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrFramework.so and b/proprietary/vendor/lib64/libqcrilNrFramework.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrLogger.so b/proprietary/vendor/lib64/libqcrilNrLogger.so
index be98c96..aff70e9 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrLogger.so and b/proprietary/vendor/lib64/libqcrilNrLogger.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrQtiBus.so b/proprietary/vendor/lib64/libqcrilNrQtiBus.so
index eabebf7..b586647 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrQtiBus.so and b/proprietary/vendor/lib64/libqcrilNrQtiBus.so differ
diff --git a/proprietary/vendor/lib64/libqcrilNrQtiMutex.so b/proprietary/vendor/lib64/libqcrilNrQtiMutex.so
index 13dd500..824d387 100644
Binary files a/proprietary/vendor/lib64/libqcrilNrQtiMutex.so and b/proprietary/vendor/lib64/libqcrilNrQtiMutex.so differ
diff --git a/proprietary/vendor/lib64/libqdi.so b/proprietary/vendor/lib64/libqdi.so
index 931b04f..79c2508 100644
Binary files a/proprietary/vendor/lib64/libqdi.so and b/proprietary/vendor/lib64/libqdi.so differ
diff --git a/proprietary/vendor/lib64/libqmi.so b/proprietary/vendor/lib64/libqmi.so
index 9956477..dc96f95 100644
Binary files a/proprietary/vendor/lib64/libqmi.so and b/proprietary/vendor/lib64/libqmi.so differ
diff --git a/proprietary/vendor/lib64/libqmimotext.so b/proprietary/vendor/lib64/libqmimotext.so
index a3c6706..1513e17 100644
Binary files a/proprietary/vendor/lib64/libqmimotext.so and b/proprietary/vendor/lib64/libqmimotext.so differ
diff --git a/proprietary/vendor/lib64/libqti-perfd-client.so b/proprietary/vendor/lib64/libqti-perfd-client.so
index d14ee94..7fa7d8c 100644
Binary files a/proprietary/vendor/lib64/libqti-perfd-client.so and b/proprietary/vendor/lib64/libqti-perfd-client.so differ
diff --git a/proprietary/vendor/lib64/libqti-perfd.so b/proprietary/vendor/lib64/libqti-perfd.so
index 595ff50..9fb91c0 100644
Binary files a/proprietary/vendor/lib64/libqti-perfd.so and b/proprietary/vendor/lib64/libqti-perfd.so differ
diff --git a/proprietary/vendor/lib64/librcc.so b/proprietary/vendor/lib64/librcc.so
index 49e6cfa..035132e 100644
Binary files a/proprietary/vendor/lib64/librcc.so and b/proprietary/vendor/lib64/librcc.so differ
diff --git a/proprietary/vendor/lib64/libril-db.so b/proprietary/vendor/lib64/libril-db.so
index 50fb4c2..dd1c3ee 100644
Binary files a/proprietary/vendor/lib64/libril-db.so and b/proprietary/vendor/lib64/libril-db.so differ
diff --git a/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so b/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so
index a1ad090..948da6d 100644
Binary files a/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so and b/proprietary/vendor/lib64/libril-qc-ltedirectdisc.so differ
diff --git a/proprietary/vendor/lib64/libril-qc-radioconfig.so b/proprietary/vendor/lib64/libril-qc-radioconfig.so
index 5b1252e..108f1a0 100644
Binary files a/proprietary/vendor/lib64/libril-qc-radioconfig.so and b/proprietary/vendor/lib64/libril-qc-radioconfig.so differ
diff --git a/proprietary/vendor/lib64/librilqmimiscservices.so b/proprietary/vendor/lib64/librilqmimiscservices.so
index a9fe6a6..f1abb2a 100644
Binary files a/proprietary/vendor/lib64/librilqmimiscservices.so and b/proprietary/vendor/lib64/librilqmimiscservices.so differ
diff --git a/proprietary/vendor/lib64/librilqmiservices.so b/proprietary/vendor/lib64/librilqmiservices.so
index 6bfad52..e6edd85 100644
Binary files a/proprietary/vendor/lib64/librilqmiservices.so and b/proprietary/vendor/lib64/librilqmiservices.so differ
diff --git a/proprietary/vendor/lib64/libsdmextension.so b/proprietary/vendor/lib64/libsdmextension.so
index 569a571..99197f4 100644
Binary files a/proprietary/vendor/lib64/libsdmextension.so and b/proprietary/vendor/lib64/libsdmextension.so differ
diff --git a/proprietary/vendor/lib64/libsdsprpc.so b/proprietary/vendor/lib64/libsdsprpc.so
index 81a71b2..24a312f 100644
Binary files a/proprietary/vendor/lib64/libsdsprpc.so and b/proprietary/vendor/lib64/libsdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libslimclient.so b/proprietary/vendor/lib64/libslimclient.so
index 37c77a9..ef69149 100644
Binary files a/proprietary/vendor/lib64/libslimclient.so and b/proprietary/vendor/lib64/libslimclient.so differ
diff --git a/proprietary/vendor/lib64/libssc.so b/proprietary/vendor/lib64/libssc.so
index 8f5211c..34464e6 100644
Binary files a/proprietary/vendor/lib64/libssc.so and b/proprietary/vendor/lib64/libssc.so differ
diff --git a/proprietary/vendor/lib64/libtzdrmgenprov.so b/proprietary/vendor/lib64/libtzdrmgenprov.so
index 9c21367..5da480e 100644
Binary files a/proprietary/vendor/lib64/libtzdrmgenprov.so and b/proprietary/vendor/lib64/libtzdrmgenprov.so differ
diff --git a/proprietary/vendor/lib64/libvppclient.so b/proprietary/vendor/lib64/libvppclient.so
index e4f477b..c9a48f8 100644
Binary files a/proprietary/vendor/lib64/libvppclient.so and b/proprietary/vendor/lib64/libvppclient.so differ
diff --git a/proprietary/vendor/lib64/libvpplibrary.so b/proprietary/vendor/lib64/libvpplibrary.so
index 22e8953..110b106 100644
Binary files a/proprietary/vendor/lib64/libvpplibrary.so and b/proprietary/vendor/lib64/libvpplibrary.so differ
diff --git a/proprietary/vendor/lib64/libwqe.so b/proprietary/vendor/lib64/libwqe.so
index 4e75614..a2e9ded 100644
Binary files a/proprietary/vendor/lib64/libwqe.so and b/proprietary/vendor/lib64/libwqe.so differ
diff --git a/proprietary/vendor/lib64/qtiril-utils.so b/proprietary/vendor/lib64/qtiril-utils.so
index 9314ab1..edcd90c 100644
Binary files a/proprietary/vendor/lib64/qtiril-utils.so and b/proprietary/vendor/lib64/qtiril-utils.so differ
diff --git a/proprietary/vendor/lib64/qtiwakelock.so b/proprietary/vendor/lib64/qtiwakelock.so
index a738052..83a8fc3 100644
Binary files a/proprietary/vendor/lib64/qtiwakelock.so and b/proprietary/vendor/lib64/qtiwakelock.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so b/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
index b262c85..a870318 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so and b/proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so differ
diff --git a/sm7325-common-vendor.mk b/sm7325-common-vendor.mk
index c7f7334..9a98bf1 100644
--- a/sm7325-common-vendor.mk
+++ b/sm7325-common-vendor.mk
@@ -6,9 +6,9 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/motorola/sm7325-common
 
 PRODUCT_COPY_FILES += \
-    vendor/motorola/sm7325-common/proprietary/system_ext/etc/permissions/moto-telephony.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto-telephony.xml \
     vendor/motorola/sm7325-common/proprietary/product/etc/permissions/UimGba.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimGba.xml \
     vendor/motorola/sm7325-common/proprietary/product/etc/permissions/UimGbaManager.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/UimGbaManager.xml \
+    vendor/motorola/sm7325-common/proprietary/system_ext/etc/permissions/moto-telephony.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/moto-telephony.xml \
     vendor/motorola/sm7325-common/proprietary/system/etc/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
     vendor/motorola/sm7325-common/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
     vendor/motorola/sm7325-common/proprietary/system/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libaptXHD_encoder.so \
@@ -305,6 +305,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/qcrilNr.db:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/qcrilNr.db \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/10.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/10.0_config.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/11.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/11.0_config.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/6.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/6.0_config.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/config/9.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/9.0_config.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/0_initial.sql \
@@ -329,7 +330,10 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/28_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/28_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/29_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/29_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/30_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/30_version_qcrildb.sql \
-    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/32_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/32_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/31_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/31_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/34_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/34_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/35_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/35_version_qcrildb.sql \
+    vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/39_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/39_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/3_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/3_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql \
     vendor/motorola/sm7325-common/proprietary/vendor/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql \
@@ -1055,7 +1059,6 @@ PRODUCT_PACKAGES += \
     CneApp \
     IWlanService \
     TimeService \
-    com.qualcomm.qti.gpudrivers.lahaina.api30 \
     uimgbaservice \
     HotwordEnrollmentOKGoogleHEXAGON \
     HotwordEnrollmentXGoogleHEXAGON \
@@ -1079,8 +1082,8 @@ PRODUCT_PACKAGES += \
     vendor.qti.ims.rcssip-V1.0-java \
     vendor.qti.ims.rcsuce-V1.0-java \
     android.hardware.neuralnetworks@1.3-service-qti \
-    c2_manifest_vendor \
     manifest_android.hardware.drm@1.3-service.widevine \
+    vendor.dolby.media.c2@1.0-service \
     vendor.qti.diag.hal.service \
     vendor.qti.gnss@4.0-service \
     vendor.qti.hardware.servicetracker@1.2-service