diff --git a/Android.bp b/Android.bp
index 67774d8..7b0585c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9677,7 +9677,6 @@ cc_prebuilt_library_shared {
                 "vendor.qti.hardware.radio.uim_remote_client@1.2",
                 "vendor.qti.hardware.radio.lpa@1.0",
                 "vendor.qti.hardware.radio.lpa@1.1",
-                "vendor.qti.hardware.radio.lpa@1.2",
                 "vendor.qti.hardware.radio.qtiradio@1.0",
                 "vendor.qti.hardware.radio.qtiradio@2.0",
                 "vendor.qti.hardware.radio.qtiradio@2.1",
@@ -9692,6 +9691,7 @@ cc_prebuilt_library_shared {
                 "android.hardware.secure_element@1.0",
                 "android.hardware.secure_element@1.1",
                 "android.hardware.secure_element@1.2",
+                "vendor.qti.hardware.radio.qcriNvOpt@1.0",
                 "vendor.qti.hardware.radio.internal.deviceinfo@1.0",
                 "libdsutils",
                 "libcutils",
@@ -12464,36 +12464,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.radio.lpa@1.2",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so",
-            ],
-            shared_libs: [
-                "vendor.qti.hardware.radio.lpa@1.0",
-                "vendor.qti.hardware.radio.lpa@1.1",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.radio.qcrilhook@1.0",
     owner: "xiaomi",
@@ -13727,6 +13697,7 @@ cc_prebuilt_library_shared {
                 "libandroid",
                 "libhidlbase",
                 "vendor.qti.imsrtpservice@3.0",
+                "vendor.qti.imsrtpservice@3.1",
                 "libdiag_system",
                 "libcutils",
                 "libutils",
@@ -14130,6 +14101,35 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.qti.imsrtpservice@3.1",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so",
+            ],
+            shared_libs: [
+                "vendor.qti.imsrtpservice@3.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
 android_app_import {
     name: "CACertService",
     owner: "xiaomi",
@@ -14655,6 +14655,7 @@ cc_prebuilt_binary {
                 "libhidlbase",
                 "android.hardware.bluetooth@1.0",
                 "vendor.qti.hardware.fm@1.0_vendor",
+                "com.dsi.ant@1.0",
                 "vendor.qti.hardware.bluetooth_sar@1.0",
                 "vendor.qti.hardware.bluetooth_sar@1.1",
                 "vendor.qti.hardware.btconfigstore@1.0",
diff --git a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
index 52d0b06..d6aee24 100644
Binary files a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk and b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk differ
diff --git a/proprietary/system/framework/tcmclient.jar b/proprietary/system/framework/tcmclient.jar
index be6e996..c1c6a7e 100644
Binary files a/proprietary/system/framework/tcmclient.jar and b/proprietary/system/framework/tcmclient.jar differ
diff --git a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
index e6ad80e..2a7545c 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/bin/dpmd b/proprietary/system_ext/bin/dpmd
index 7cb9fa0..2ac31c8 100755
Binary files a/proprietary/system_ext/bin/dpmd and b/proprietary/system_ext/bin/dpmd differ
diff --git a/proprietary/system_ext/framework/audiosphere.jar b/proprietary/system_ext/framework/audiosphere.jar
index f116345..6f54307 100644
Binary files a/proprietary/system_ext/framework/audiosphere.jar and b/proprietary/system_ext/framework/audiosphere.jar differ
diff --git a/proprietary/system_ext/framework/com.qti.dpmframework.jar b/proprietary/system_ext/framework/com.qti.dpmframework.jar
index 36021cd..a818393 100644
Binary files a/proprietary/system_ext/framework/com.qti.dpmframework.jar and b/proprietary/system_ext/framework/com.qti.dpmframework.jar differ
diff --git a/proprietary/system_ext/framework/dpmapi.jar b/proprietary/system_ext/framework/dpmapi.jar
index ecb15d8..e6ae2e4 100644
Binary files a/proprietary/system_ext/framework/dpmapi.jar and b/proprietary/system_ext/framework/dpmapi.jar differ
diff --git a/proprietary/system_ext/framework/qcrilhook.jar b/proprietary/system_ext/framework/qcrilhook.jar
index 6a6db00..b8a445e 100644
Binary files a/proprietary/system_ext/framework/qcrilhook.jar and b/proprietary/system_ext/framework/qcrilhook.jar differ
diff --git a/proprietary/system_ext/framework/qti-telephony-common.jar b/proprietary/system_ext/framework/qti-telephony-common.jar
index 7fee165..19e6b3f 100644
Binary files a/proprietary/system_ext/framework/qti-telephony-common.jar and b/proprietary/system_ext/framework/qti-telephony-common.jar differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so
index cf54da7..8a6d2e4 100644
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so and b/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so differ
diff --git a/proprietary/system_ext/lib64/fm_helium.so b/proprietary/system_ext/lib64/fm_helium.so
index 8d05d3a..e3b8a6f 100644
Binary files a/proprietary/system_ext/lib64/fm_helium.so and b/proprietary/system_ext/lib64/fm_helium.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvideocodec.so b/proprietary/system_ext/lib64/lib-imsvideocodec.so
index 8070219..7efa0a1 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..1bd4011 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/lib-imsvtextutils.so b/proprietary/system_ext/lib64/lib-imsvtextutils.so
index d9a42f1..0a870b2 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvtextutils.so and b/proprietary/system_ext/lib64/lib-imsvtextutils.so differ
diff --git a/proprietary/system_ext/lib64/lib-imsvtutils.so b/proprietary/system_ext/lib64/lib-imsvtutils.so
index b24d842..50c3e66 100644
Binary files a/proprietary/system_ext/lib64/lib-imsvtutils.so and b/proprietary/system_ext/lib64/lib-imsvtutils.so differ
diff --git a/proprietary/system_ext/lib64/libdiag_system.so b/proprietary/system_ext/lib64/libdiag_system.so
index c42285a..666b86b 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/libdpmctmgr.so b/proprietary/system_ext/lib64/libdpmctmgr.so
index 6cdb2e0..681a7fb 100644
Binary files a/proprietary/system_ext/lib64/libdpmctmgr.so and b/proprietary/system_ext/lib64/libdpmctmgr.so differ
diff --git a/proprietary/system_ext/lib64/libdpmfdmgr.so b/proprietary/system_ext/lib64/libdpmfdmgr.so
index fd13462..8eb6c9e 100644
Binary files a/proprietary/system_ext/lib64/libdpmfdmgr.so and b/proprietary/system_ext/lib64/libdpmfdmgr.so differ
diff --git a/proprietary/system_ext/lib64/libdpmframework.so b/proprietary/system_ext/lib64/libdpmframework.so
index b437b5c..54c5456 100644
Binary files a/proprietary/system_ext/lib64/libdpmframework.so and b/proprietary/system_ext/lib64/libdpmframework.so differ
diff --git a/proprietary/system_ext/lib64/libdpmtcm.so b/proprietary/system_ext/lib64/libdpmtcm.so
index 73b8a90..7303d36 100644
Binary files a/proprietary/system_ext/lib64/libdpmtcm.so and b/proprietary/system_ext/lib64/libdpmtcm.so differ
diff --git a/proprietary/system_ext/lib64/libfm-hci.so b/proprietary/system_ext/lib64/libfm-hci.so
index 539e0a1..b8aef98 100644
Binary files a/proprietary/system_ext/lib64/libfm-hci.so and b/proprietary/system_ext/lib64/libfm-hci.so differ
diff --git a/proprietary/system_ext/lib64/libimscamera_jni.so b/proprietary/system_ext/lib64/libimscamera_jni.so
index 1faac5b..71784f1 100644
Binary files a/proprietary/system_ext/lib64/libimscamera_jni.so and b/proprietary/system_ext/lib64/libimscamera_jni.so differ
diff --git a/proprietary/system_ext/lib64/libimsmedia_jni.so b/proprietary/system_ext/lib64/libimsmedia_jni.so
index a14e518..ad07794 100644
Binary files a/proprietary/system_ext/lib64/libimsmedia_jni.so and b/proprietary/system_ext/lib64/libimsmedia_jni.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so b/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so
index 423bb4f..9e79901 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.diaghal@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so
index 35006f2..d60a0dd 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so and b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so
index 4159948..a7b19d1 100644
Binary files a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so and b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so
new file mode 100644
index 0000000..c6e6055
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so differ
diff --git a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
index df2dbcf..759e421 100644
Binary files a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk and b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk differ
diff --git a/proprietary/system_ext/priv-app/ims/ims.apk b/proprietary/system_ext/priv-app/ims/ims.apk
index 5c70a65..55e7e8d 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 d9fa10a..b886fb1 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/IWlanService/IWlanService.apk b/proprietary/vendor/app/IWlanService/IWlanService.apk
index f2fbadf..853de85 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 70393e6..21d7a7a 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/adpl b/proprietary/vendor/bin/adpl
index 7208552..0737f4f 100755
Binary files a/proprietary/vendor/bin/adpl and b/proprietary/vendor/bin/adpl differ
diff --git a/proprietary/vendor/bin/cnd b/proprietary/vendor/bin/cnd
index 25437a5..81d3616 100755
Binary files a/proprietary/vendor/bin/cnd and b/proprietary/vendor/bin/cnd differ
diff --git a/proprietary/vendor/bin/hvdcp_opti b/proprietary/vendor/bin/hvdcp_opti
index fbf4412..f10d713 100755
Binary files a/proprietary/vendor/bin/hvdcp_opti and b/proprietary/vendor/bin/hvdcp_opti 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 bcbfa78..1661859 100755
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/ims_rtp_daemon b/proprietary/vendor/bin/ims_rtp_daemon
index 6464972..c2ce83f 100755
Binary files a/proprietary/vendor/bin/ims_rtp_daemon and b/proprietary/vendor/bin/ims_rtp_daemon differ
diff --git a/proprietary/vendor/bin/imsdatadaemon b/proprietary/vendor/bin/imsdatadaemon
index f6e56f7..d8bbcde 100755
Binary files a/proprietary/vendor/bin/imsdatadaemon and b/proprietary/vendor/bin/imsdatadaemon differ
diff --git a/proprietary/vendor/bin/imsqmidaemon b/proprietary/vendor/bin/imsqmidaemon
index 76e4e0d..d11adc9 100755
Binary files a/proprietary/vendor/bin/imsqmidaemon and b/proprietary/vendor/bin/imsqmidaemon differ
diff --git a/proprietary/vendor/bin/loc_launcher b/proprietary/vendor/bin/loc_launcher
index dcac208..d2a613f 100755
Binary files a/proprietary/vendor/bin/loc_launcher and b/proprietary/vendor/bin/loc_launcher differ
diff --git a/proprietary/vendor/bin/lowi-server b/proprietary/vendor/bin/lowi-server
index 06ddc4d..1870895 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 14be78d..97aac8c 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 19500cd..32822c2 100755
Binary files a/proprietary/vendor/bin/pd-mapper and b/proprietary/vendor/bin/pd-mapper differ
diff --git a/proprietary/vendor/bin/qseecomd b/proprietary/vendor/bin/qseecomd
index 73f4c68..0139869 100755
Binary files a/proprietary/vendor/bin/qseecomd and b/proprietary/vendor/bin/qseecomd differ
diff --git a/proprietary/vendor/bin/qti b/proprietary/vendor/bin/qti
index 73ac568..a84bdb5 100755
Binary files a/proprietary/vendor/bin/qti and b/proprietary/vendor/bin/qti differ
diff --git a/proprietary/vendor/bin/rmt_storage b/proprietary/vendor/bin/rmt_storage
index fcac7b1..7ebb2db 100755
Binary files a/proprietary/vendor/bin/rmt_storage and b/proprietary/vendor/bin/rmt_storage differ
diff --git a/proprietary/vendor/bin/slim_daemon b/proprietary/vendor/bin/slim_daemon
index 74eaad6..10763a8 100755
Binary files a/proprietary/vendor/bin/slim_daemon and b/proprietary/vendor/bin/slim_daemon differ
diff --git a/proprietary/vendor/bin/xtra-daemon b/proprietary/vendor/bin/xtra-daemon
index 2738acb..61c22aa 100755
Binary files a/proprietary/vendor/bin/xtra-daemon and b/proprietary/vendor/bin/xtra-daemon differ
diff --git a/proprietary/vendor/etc/cne/mwqem.conf b/proprietary/vendor/etc/cne/mwqem.conf
index fb44c05..66cfede 100644
--- a/proprietary/vendor/etc/cne/mwqem.conf
+++ b/proprietary/vendor/etc/cne/mwqem.conf
@@ -14,4 +14,4 @@ lqa_update_threshold:0.25
 #in this duration
 lqa_update_count_timer:10000
 #default URL for establishing a tcp sessions
-mwqem_http_url:www.qualcomm.com
\ No newline at end of file
+mwqem_http_url:www.qualcomm.com
diff --git a/proprietary/vendor/etc/data/dsi_config.xml b/proprietary/vendor/etc/data/dsi_config.xml
index 14d9028..ab1890f 100644
--- a/proprietary/vendor/etc/data/dsi_config.xml
+++ b/proprietary/vendor/etc/data/dsi_config.xml
@@ -1352,45 +1352,5 @@
        <data type="string"> rmnet_data10 </data>
      </list>
    </listitem>
-
-   <!-- Configuration for QTang  -->
-   <listitem name="qtang">
-
-     <data name="qos_enabled" type="int"> 1 </data>
-     <data name="rmnet_data_enabled" type="int"> 1 </data>
-     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
-
-     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
-     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
-
-     <data name="num_dsi_handles" type="int"> 11 </data>
-     <list name="device_names">
-       <data type="string"> rmnet_data0 </data>
-       <data type="string"> rmnet_data1 </data>
-       <data type="string"> rmnet_data2 </data>
-       <data type="string"> rmnet_data3 </data>
-       <data type="string"> rmnet_data4 </data>
-       <data type="string"> rmnet_data5 </data>
-       <data type="string"> rmnet_data6 </data>
-       <data type="string"> rmnet_data7 </data>
-       <data type="string"> rmnet_data8 </data>
-       <data type="string"> rmnet_data9 </data>
-       <data type="string"> rmnet_data10 </data>
-     </list>
-     <list name="control_port_names">
-       <data type="string"> rmnet_data0 </data>
-       <data type="string"> rmnet_data1 </data>
-       <data type="string"> rmnet_data2 </data>
-       <data type="string"> rmnet_data3 </data>
-       <data type="string"> rmnet_data4 </data>
-       <data type="string"> rmnet_data5 </data>
-       <data type="string"> rmnet_data6 </data>
-       <data type="string"> rmnet_data7 </data>
-       <data type="string"> rmnet_data8 </data>
-       <data type="string"> rmnet_data9 </data>
-       <data type="string"> rmnet_data10 </data>
-     </list>
-   </listitem>
 </list>
 
diff --git a/proprietary/vendor/etc/data/netmgr_config.xml b/proprietary/vendor/etc/data/netmgr_config.xml
index 76471ef..04abd8e 100644
--- a/proprietary/vendor/etc/data/netmgr_config.xml
+++ b/proprietary/vendor/etc/data/netmgr_config.xml
@@ -3482,112 +3482,4 @@
       <!-- Number of above reverse data ports inited on bootup -->
       <data name="static_rev_links" type="int"> 4 </data>
    </listitem>
-
-   <!-- QTang parameters -->
-   <listitem name = "qtang">
-
-      <data name="qmi_dpm_enabled" type="int"> 1 </data>
-      <data name="use_qmuxd" type="int"> 0 </data>
-      <data name="dpm_retry_timeout" type="int"> 10000 </data>
-      <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 4 </data>
-      <data name="qmi_pc" type="int"> 1 </data>
-      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
-
-      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
-      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
-      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
-
-      <data name="tc_ul_baserate" type="int"> 155000000 </data>
-      <data name="dynamic_tc_ul_baserate" type="int"> 1 </data>
-      <data name="tc_ul_burst" type="int"> 25000 </data>
-
-      <data name="rmnet_data_enabled" type="int"> 1 </data>
-      <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
-      <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
-      <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
-      <data name="dataformat_agg_ul_size" type="int"> 0 </data>
-      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 8 </data>
-      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 8 </data>
-      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
-      <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
-      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-      <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
-      <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
-      <data name="netdev_max_backlog" type="int"> 10000 </data>
-
-      <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
-      <data name="disable_hystart" type="int"> 1 </data>
-      <data name="initial_ssthresh" type="int"> 1400 </data>
-      <data name="pnd_rps_mask" type="int"> 2 </data>
-      <data name="vnd_rps_mask" type="int"> 12 </data>
-      <data name="netdev_budget" type="int"> 0 </data>
-      <data name="tcp_mtu_probing" type="int"> 2 </data>
-      <data name="qos_via_idl" type="int"> 1 </data>
-      <data name="skip_buffered_qos_modify" type="int"> 1 </data>
-
-      <data name="num_modems" type="int"> 2 </data>
-      <list name="modems_enabled">
-         <data type="int"> 1 </data> <!-- MODEM_MSM -->
-         <data type="int"> 0 </data> <!-- MODEM_MDM -->
-      </list>
-
-      <data name="control_ports_len" type="int"> 11 </data>
-      <list name="control_ports">
-         <data type="string"> rmnet_data0 </data>
-         <data type="string"> rmnet_data1 </data>
-         <data type="string"> rmnet_data2 </data>
-         <data type="string"> rmnet_data3 </data>
-         <data type="string"> rmnet_data4 </data>
-         <data type="string"> rmnet_data5 </data>
-         <data type="string"> rmnet_data6 </data>
-         <data type="string"> rmnet_data7 </data>
-         <data type="string"> rmnet_data8 </data>
-         <data type="string"> rmnet_data9 </data>
-         <data type="string"> rmnet_data10 </data>
-      </list>
-
-      <data name="data_ports_len" type="int"> 11 </data>
-      <list name="data_ports">
-         <data type="string"> rmnet_data0 </data>
-         <data type="string"> rmnet_data1 </data>
-         <data type="string"> rmnet_data2 </data>
-         <data type="string"> rmnet_data3 </data>
-         <data type="string"> rmnet_data4 </data>
-         <data type="string"> rmnet_data5 </data>
-         <data type="string"> rmnet_data6 </data>
-         <data type="string"> rmnet_data7 </data>
-         <data type="string"> rmnet_data8 </data>
-         <data type="string"> rmnet_data9 </data>
-         <data type="string"> rmnet_data10 </data>
-      </list>
-
-      <!-- iWLAN ports -->
-      <data name="iwlan_enable" type="int"> 1 </data>
-      <data name="rev_control_ports_len" type="int"> 9 </data>
-      <list name="rev_control_ports">
-         <data type="string"> r_rmnet_data0 </data>
-         <data type="string"> r_rmnet_data1 </data>
-         <data type="string"> r_rmnet_data2 </data>
-         <data type="string"> r_rmnet_data3 </data>
-         <data type="string"> r_rmnet_data4 </data>
-         <data type="string"> r_rmnet_data5 </data>
-         <data type="string"> r_rmnet_data6 </data>
-         <data type="string"> r_rmnet_data7 </data>
-         <data type="string"> r_rmnet_data8 </data>
-      </list>
-
-      <data name="rev_data_ports_len" type="int"> 9 </data>
-      <list name="rev_data_ports">
-        <data type="string"> r_rmnet_data0 </data>
-        <data type="string"> r_rmnet_data1 </data>
-        <data type="string"> r_rmnet_data2 </data>
-        <data type="string"> r_rmnet_data3 </data>
-        <data type="string"> r_rmnet_data4 </data>
-        <data type="string"> r_rmnet_data5 </data>
-        <data type="string"> r_rmnet_data6 </data>
-        <data type="string"> r_rmnet_data7 </data>
-        <data type="string"> r_rmnet_data8 </data>
-      </list>
-   </listitem>
 </list>
diff --git a/proprietary/vendor/etc/init/imsrcsd.rc b/proprietary/vendor/etc/init/imsrcsd.rc
index c2643ec..fa325d5 100644
--- a/proprietary/vendor/etc/init/imsrcsd.rc
+++ b/proprietary/vendor/etc/init/imsrcsd.rc
@@ -6,3 +6,4 @@ service vendor.imsrcsservice /vendor/bin/imsrcsd
     class main
     user radio
     group radio vendor_qti_diag log inet wakelock
+    disabled
diff --git a/proprietary/vendor/etc/init/qcrild.rc b/proprietary/vendor/etc/init/qcrild.rc
index 8aabd73..5652c79 100644
--- a/proprietary/vendor/etc/init/qcrild.rc
+++ b/proprietary/vendor/etc/init/qcrild.rc
@@ -2,14 +2,14 @@ service vendor.qcrild /vendor/bin/hw/qcrild
     class main
     user radio
     disabled
-    group radio cache inet misc audio log readproc wakelock oem_2901
+    group radio cache inet misc audio log readproc wakelock oem_2901 net_raw system sdcard_rw sdcard_r
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
 
 service vendor.qcrild2 /vendor/bin/hw/qcrild -c 2
     class main
     user radio
     disabled
-    group radio cache inet misc audio log readproc wakelock oem_2901
+    group radio cache inet misc audio log readproc wakelock oem_2901 net_raw system sdcard_rw sdcard_r
     capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
 
 service vendor.qcrild3 /vendor/bin/hw/qcrild -c 3
diff --git a/proprietary/vendor/libnfc-nxp_RF.conf b/proprietary/vendor/etc/libnfc-nxp_RF.conf
similarity index 100%
rename from proprietary/vendor/libnfc-nxp_RF.conf
rename to proprietary/vendor/etc/libnfc-nxp_RF.conf
diff --git a/proprietary/vendor/etc/seccomp_policy/imsrtp.policy b/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
index 38dc4c9..3ed54f6 100644
--- a/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
+++ b/proprietary/vendor/etc/seccomp_policy/imsrtp.policy
@@ -92,4 +92,4 @@ sched_getaffinity: 1
 socket: 1
 process_vm_readv: 1
 tgkill: 1
-sigreturn: 1
+
diff --git a/proprietary/vendor/firmware/a615_zap.b01 b/proprietary/vendor/firmware/a615_zap.b01
index 64bf3c7..ad8b5a0 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 3e7bacd..bd60e0b 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 69bf853..1232202 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/aw8624_haptic.bin b/proprietary/vendor/firmware/aw8624_haptic.bin
index 5ec2a79..6f0c3fe 100644
Binary files a/proprietary/vendor/firmware/aw8624_haptic.bin and b/proprietary/vendor/firmware/aw8624_haptic.bin differ
diff --git a/proprietary/vendor/firmware/ipa_fws.b01 b/proprietary/vendor/firmware/ipa_fws.b01
index dbd28bc..9de8292 100644
Binary files a/proprietary/vendor/firmware/ipa_fws.b01 and b/proprietary/vendor/firmware/ipa_fws.b01 differ
diff --git a/proprietary/vendor/firmware/ipa_fws.elf b/proprietary/vendor/firmware/ipa_fws.elf
index 9f3cd68..72d254c 100644
Binary files a/proprietary/vendor/firmware/ipa_fws.elf and b/proprietary/vendor/firmware/ipa_fws.elf differ
diff --git a/proprietary/vendor/firmware/ipa_fws.mdt b/proprietary/vendor/firmware/ipa_fws.mdt
index 8e13849..68a3f59 100644
Binary files a/proprietary/vendor/firmware/ipa_fws.mdt and b/proprietary/vendor/firmware/ipa_fws.mdt differ
diff --git a/proprietary/vendor/lib/egl/libGLESv2_adreno.so b/proprietary/vendor/lib/egl/libGLESv2_adreno.so
index 770027e..200b91f 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 222da18..7d26555 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/vendor.qti.hardware.bluetooth_audio@2.1-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so
index d69b964..e9810ce 100644
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so and b/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so differ
diff --git a/proprietary/vendor/lib/hw/vulkan.adreno.so b/proprietary/vendor/lib/hw/vulkan.adreno.so
index 271aa96..605c7d9 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 be0448c..1e0b10b 100644
Binary files a/proprietary/vendor/lib/libCB.so and b/proprietary/vendor/lib/libCB.so differ
diff --git a/proprietary/vendor/lib/libadreno_utils.so b/proprietary/vendor/lib/libadreno_utils.so
index 99c0ef6..a8b67bf 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 7bb1713..98e95ff 100644
Binary files a/proprietary/vendor/lib/libadsprpc.so and b/proprietary/vendor/lib/libadsprpc.so differ
diff --git a/proprietary/vendor/lib/libbluetooth_audio_session_qti.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti.so
index 2e14d28..cb754ee 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/libbluetooth_audio_session_qti_2_1.so b/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so
index 7123326..47de241 100644
Binary files a/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so and b/proprietary/vendor/lib/libbluetooth_audio_session_qti_2_1.so differ
diff --git a/proprietary/vendor/lib/libcdsprpc.so b/proprietary/vendor/lib/libcdsprpc.so
index 43236de..cab852e 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 3154c15..e783951 100644
Binary files a/proprietary/vendor/lib/libdiag.so and b/proprietary/vendor/lib/libdiag.so differ
diff --git a/proprietary/vendor/lib/libdsutils.so b/proprietary/vendor/lib/libdsutils.so
index 699f0a3..89d3d37 100644
Binary files a/proprietary/vendor/lib/libdsutils.so and b/proprietary/vendor/lib/libdsutils.so differ
diff --git a/proprietary/vendor/lib/libgsl.so b/proprietary/vendor/lib/libgsl.so
index 8d4141c..98d2b90 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 045ea96..030eacb 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/libqmi.so b/proprietary/vendor/lib/libqmi.so
index 7cccb1b..812cfd7 100644
Binary files a/proprietary/vendor/lib/libqmi.so and b/proprietary/vendor/lib/libqmi.so differ
diff --git a/proprietary/vendor/lib/libqmi_client_helper.so b/proprietary/vendor/lib/libqmi_client_helper.so
index d9175b6..fd56b6b 100644
Binary files a/proprietary/vendor/lib/libqmi_client_helper.so and b/proprietary/vendor/lib/libqmi_client_helper.so differ
diff --git a/proprietary/vendor/lib/libqmi_client_qmux.so b/proprietary/vendor/lib/libqmi_client_qmux.so
index 320d31f..00c104e 100644
Binary files a/proprietary/vendor/lib/libqmi_client_qmux.so and b/proprietary/vendor/lib/libqmi_client_qmux.so differ
diff --git a/proprietary/vendor/lib/libqmiservices.so b/proprietary/vendor/lib/libqmiservices.so
index c1c23b9..4971614 100644
Binary files a/proprietary/vendor/lib/libqmiservices.so and b/proprietary/vendor/lib/libqmiservices.so differ
diff --git a/proprietary/vendor/lib/libsmwrapper.so b/proprietary/vendor/lib/libsmwrapper.so
index 0949b05..e9e1c9b 100644
Binary files a/proprietary/vendor/lib/libsmwrapper.so and b/proprietary/vendor/lib/libsmwrapper.so differ
diff --git a/proprietary/vendor/lib/libvppclient.so b/proprietary/vendor/lib/libvppclient.so
index af36618..6496209 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 a3baca7..9280659 100644
Binary files a/proprietary/vendor/lib/libvpplibrary.so and b/proprietary/vendor/lib/libvpplibrary.so differ
diff --git a/proprietary/vendor/lib/soundfx/libmisoundfx.so b/proprietary/vendor/lib/soundfx/libmisoundfx.so
index ea28c48..0aa6982 100644
Binary files a/proprietary/vendor/lib/soundfx/libmisoundfx.so and b/proprietary/vendor/lib/soundfx/libmisoundfx.so differ
diff --git a/proprietary/vendor/lib64/egl/libGLESv2_adreno.so b/proprietary/vendor/lib64/egl/libGLESv2_adreno.so
index 09c26d1..0ce0b15 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 26845a7..60eb1fe 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 1c1cf6d..0e97eeb 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/vendor.qti.gnss@4.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so
index 87d6ac1..488c5bd 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.fm@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
index 34c85ed..66b58ed 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 cc3389a..6713646 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 802e927..c98f77c 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-imsrcs-v2.so b/proprietary/vendor/lib64/lib-imsrcs-v2.so
index 3ff7c85..4aed7f6 100644
Binary files a/proprietary/vendor/lib64/lib-imsrcs-v2.so and b/proprietary/vendor/lib64/lib-imsrcs-v2.so differ
diff --git a/proprietary/vendor/lib64/lib-imsvtcore.so b/proprietary/vendor/lib64/lib-imsvtcore.so
index 0376e6f..1857f3d 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-rcsconfig.so b/proprietary/vendor/lib64/lib-rcsconfig.so
index d3086d1..9e9ff03 100644
Binary files a/proprietary/vendor/lib64/lib-rcsconfig.so and b/proprietary/vendor/lib64/lib-rcsconfig.so differ
diff --git a/proprietary/vendor/lib64/lib-rtpsl.so b/proprietary/vendor/lib64/lib-rtpsl.so
index dea0890..facfe42 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 eea3e0e..6eba264 100644
Binary files a/proprietary/vendor/lib64/libCB.so and b/proprietary/vendor/lib64/libCB.so differ
diff --git a/proprietary/vendor/lib64/libadreno_utils.so b/proprietary/vendor/lib64/libadreno_utils.so
index 8f553ae..206d070 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 c9acc18..6c85325 100644
Binary files a/proprietary/vendor/lib64/libadsprpc.so and b/proprietary/vendor/lib64/libadsprpc.so differ
diff --git a/proprietary/vendor/lib64/libcdfw.so b/proprietary/vendor/lib64/libcdfw.so
index 3b8e36d..9902b2e 100644
Binary files a/proprietary/vendor/lib64/libcdfw.so and b/proprietary/vendor/lib64/libcdfw.so differ
diff --git a/proprietary/vendor/lib64/libcdfw_remote_api.so b/proprietary/vendor/lib64/libcdfw_remote_api.so
index f8456e2..0d25ca2 100644
Binary files a/proprietary/vendor/lib64/libcdfw_remote_api.so and b/proprietary/vendor/lib64/libcdfw_remote_api.so differ
diff --git a/proprietary/vendor/lib64/libcdsprpc.so b/proprietary/vendor/lib64/libcdsprpc.so
index 1707077..b5bf8a5 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 8f7dd2a..69f1aba 100644
Binary files a/proprietary/vendor/lib64/libcne.so and b/proprietary/vendor/lib64/libcne.so differ
diff --git a/proprietary/vendor/lib64/libcneapiclient.so b/proprietary/vendor/lib64/libcneapiclient.so
index 1054250..32796bf 100644
Binary files a/proprietary/vendor/lib64/libcneapiclient.so and b/proprietary/vendor/lib64/libcneapiclient.so differ
diff --git a/proprietary/vendor/lib64/libcneoplookup.so b/proprietary/vendor/lib64/libcneoplookup.so
index 16c0977..8b2c2cc 100644
Binary files a/proprietary/vendor/lib64/libcneoplookup.so and b/proprietary/vendor/lib64/libcneoplookup.so differ
diff --git a/proprietary/vendor/lib64/libconfigdb.so b/proprietary/vendor/lib64/libconfigdb.so
index b842c82..df74046 100644
Binary files a/proprietary/vendor/lib64/libconfigdb.so and b/proprietary/vendor/lib64/libconfigdb.so differ
diff --git a/proprietary/vendor/lib64/libdataitems.so b/proprietary/vendor/lib64/libdataitems.so
index 2be1815..d302e56 100644
Binary files a/proprietary/vendor/lib64/libdataitems.so and b/proprietary/vendor/lib64/libdataitems.so differ
diff --git a/proprietary/vendor/lib64/libdiag.so b/proprietary/vendor/lib64/libdiag.so
index f6b0d4b..db2fed8 100644
Binary files a/proprietary/vendor/lib64/libdiag.so and b/proprietary/vendor/lib64/libdiag.so differ
diff --git a/proprietary/vendor/lib64/libdsi_netctrl.so b/proprietary/vendor/lib64/libdsi_netctrl.so
index 03c6dc8..fbb84f5 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/libdsutils.so b/proprietary/vendor/lib64/libdsutils.so
index e25ed35..9267220 100644
Binary files a/proprietary/vendor/lib64/libdsutils.so and b/proprietary/vendor/lib64/libdsutils.so differ
diff --git a/proprietary/vendor/lib64/libgdtap.so b/proprietary/vendor/lib64/libgdtap.so
index f21e1fd..f320146 100644
Binary files a/proprietary/vendor/lib64/libgdtap.so and b/proprietary/vendor/lib64/libgdtap.so differ
diff --git a/proprietary/vendor/lib64/libgsl.so b/proprietary/vendor/lib64/libgsl.so
index 2f4a1a5..b12b463 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 1298e13..3b1466a 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/libizat_client_api.so b/proprietary/vendor/lib64/libizat_client_api.so
index d6ad5ea..8e9c41a 100644
Binary files a/proprietary/vendor/lib64/libizat_client_api.so and b/proprietary/vendor/lib64/libizat_client_api.so differ
diff --git a/proprietary/vendor/lib64/libizat_core.so b/proprietary/vendor/lib64/libizat_core.so
index cca2f8b..2685786 100644
Binary files a/proprietary/vendor/lib64/libizat_core.so and b/proprietary/vendor/lib64/libizat_core.so differ
diff --git a/proprietary/vendor/lib64/liblbs_core.so b/proprietary/vendor/lib64/liblbs_core.so
index 1ea0203..c5df7e8 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 6a3ac95..667d4d7 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/libloc_api_v02.so b/proprietary/vendor/lib64/libloc_api_v02.so
index 47b6ecc..2ba5026 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/libloc_socket.so b/proprietary/vendor/lib64/libloc_socket.so
index 0cc2e00..644b970 100644
Binary files a/proprietary/vendor/lib64/libloc_socket.so and b/proprietary/vendor/lib64/libloc_socket.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice.so b/proprietary/vendor/lib64/liblocationservice.so
index 9171c2e..4e0aaa4 100644
Binary files a/proprietary/vendor/lib64/liblocationservice.so and b/proprietary/vendor/lib64/liblocationservice.so differ
diff --git a/proprietary/vendor/lib64/liblocationservice_glue.so b/proprietary/vendor/lib64/liblocationservice_glue.so
index 344be2d..aed2327 100644
Binary files a/proprietary/vendor/lib64/liblocationservice_glue.so and b/proprietary/vendor/lib64/liblocationservice_glue.so differ
diff --git a/proprietary/vendor/lib64/liblowi_client.so b/proprietary/vendor/lib64/liblowi_client.so
index ebabe47..00cdbbb 100644
Binary files a/proprietary/vendor/lib64/liblowi_client.so and b/proprietary/vendor/lib64/liblowi_client.so differ
diff --git a/proprietary/vendor/lib64/liblowi_wifihal.so b/proprietary/vendor/lib64/liblowi_wifihal.so
index 0fb8a1d..daefd7d 100644
Binary files a/proprietary/vendor/lib64/liblowi_wifihal.so and b/proprietary/vendor/lib64/liblowi_wifihal.so differ
diff --git a/proprietary/vendor/lib64/liblqe.so b/proprietary/vendor/lib64/liblqe.so
index 596b6e1..9df298c 100644
Binary files a/proprietary/vendor/lib64/liblqe.so and b/proprietary/vendor/lib64/liblqe.so differ
diff --git a/proprietary/vendor/lib64/libmdsprpc.so b/proprietary/vendor/lib64/libmdsprpc.so
index 34c50cd..d65433f 100644
Binary files a/proprietary/vendor/lib64/libmdsprpc.so and b/proprietary/vendor/lib64/libmdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libminksocket.so b/proprietary/vendor/lib64/libminksocket.so
index 3ed6594..38f0abc 100644
Binary files a/proprietary/vendor/lib64/libminksocket.so and b/proprietary/vendor/lib64/libminksocket.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr.so b/proprietary/vendor/lib64/libnetmgr.so
index 98482c9..128bd37 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 2c7b59c..bd6569f 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/libnetmgr_nr_fusion.so b/proprietary/vendor/lib64/libnetmgr_nr_fusion.so
index accb707..9df952b 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_nr_fusion.so and b/proprietary/vendor/lib64/libnetmgr_nr_fusion.so differ
diff --git a/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so b/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so
index df73b23..3234ba6 100644
Binary files a/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so and b/proprietary/vendor/lib64/libnetmgr_rmnet_ext.so differ
diff --git a/proprietary/vendor/lib64/libnlnetmgr.so b/proprietary/vendor/lib64/libnlnetmgr.so
index 2402409..309273a 100644
Binary files a/proprietary/vendor/lib64/libnlnetmgr.so and b/proprietary/vendor/lib64/libnlnetmgr.so differ
diff --git a/proprietary/vendor/lib64/liboemcrypto.so b/proprietary/vendor/lib64/liboemcrypto.so
index 1ca2e63..2696a6e 100644
Binary files a/proprietary/vendor/lib64/liboemcrypto.so and b/proprietary/vendor/lib64/liboemcrypto.so differ
diff --git a/proprietary/vendor/lib64/libpdmapper.so b/proprietary/vendor/lib64/libpdmapper.so
index 7e91945..568f891 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 243ae2c..62abd17 100644
Binary files a/proprietary/vendor/lib64/libpdnotifier.so and b/proprietary/vendor/lib64/libpdnotifier.so differ
diff --git a/proprietary/vendor/lib64/libqcmaputils.so b/proprietary/vendor/lib64/libqcmaputils.so
index abe8ca1..0297d81 100644
Binary files a/proprietary/vendor/lib64/libqcmaputils.so and b/proprietary/vendor/lib64/libqcmaputils.so differ
diff --git a/proprietary/vendor/lib64/libqdi.so b/proprietary/vendor/lib64/libqdi.so
index aa36f0d..b47200b 100644
Binary files a/proprietary/vendor/lib64/libqdi.so and b/proprietary/vendor/lib64/libqdi.so differ
diff --git a/proprietary/vendor/lib64/libqdp.so b/proprietary/vendor/lib64/libqdp.so
index ddb9b85..11cff58 100644
Binary files a/proprietary/vendor/lib64/libqdp.so and b/proprietary/vendor/lib64/libqdp.so differ
diff --git a/proprietary/vendor/lib64/libqmi.so b/proprietary/vendor/lib64/libqmi.so
index 51faf2d..e7406d1 100644
Binary files a/proprietary/vendor/lib64/libqmi.so and b/proprietary/vendor/lib64/libqmi.so differ
diff --git a/proprietary/vendor/lib64/libqmi_client_helper.so b/proprietary/vendor/lib64/libqmi_client_helper.so
index 8038cdd..4b3da3d 100644
Binary files a/proprietary/vendor/lib64/libqmi_client_helper.so and b/proprietary/vendor/lib64/libqmi_client_helper.so differ
diff --git a/proprietary/vendor/lib64/libqmi_client_qmux.so b/proprietary/vendor/lib64/libqmi_client_qmux.so
index c1cc1b4..668edb2 100644
Binary files a/proprietary/vendor/lib64/libqmi_client_qmux.so and b/proprietary/vendor/lib64/libqmi_client_qmux.so differ
diff --git a/proprietary/vendor/lib64/libqmiservices.so b/proprietary/vendor/lib64/libqmiservices.so
index f2b36e5..9c4eaf5 100644
Binary files a/proprietary/vendor/lib64/libqmiservices.so and b/proprietary/vendor/lib64/libqmiservices.so differ
diff --git a/proprietary/vendor/lib64/libril-qc-hal-qmi.so b/proprietary/vendor/lib64/libril-qc-hal-qmi.so
index 22736c7..6884a4c 100644
Binary files a/proprietary/vendor/lib64/libril-qc-hal-qmi.so and b/proprietary/vendor/lib64/libril-qc-hal-qmi.so differ
diff --git a/proprietary/vendor/lib64/libril-qc-logger.so b/proprietary/vendor/lib64/libril-qc-logger.so
index 95205c8..abcba57 100644
Binary files a/proprietary/vendor/lib64/libril-qc-logger.so and b/proprietary/vendor/lib64/libril-qc-logger.so differ
diff --git a/proprietary/vendor/lib64/librilqmiservices.so b/proprietary/vendor/lib64/librilqmiservices.so
index 6f52f3b..5893227 100644
Binary files a/proprietary/vendor/lib64/librilqmiservices.so and b/proprietary/vendor/lib64/librilqmiservices.so differ
diff --git a/proprietary/vendor/lib64/libsdedrm.so b/proprietary/vendor/lib64/libsdedrm.so
index e69dad2..acc4598 100644
Binary files a/proprietary/vendor/lib64/libsdedrm.so and b/proprietary/vendor/lib64/libsdedrm.so differ
diff --git a/proprietary/vendor/lib64/libsdm-color.so b/proprietary/vendor/lib64/libsdm-color.so
index 2d77d1b..ed9ab7c 100644
Binary files a/proprietary/vendor/lib64/libsdm-color.so and b/proprietary/vendor/lib64/libsdm-color.so differ
diff --git a/proprietary/vendor/lib64/libsdm-colormgr-algo.so b/proprietary/vendor/lib64/libsdm-colormgr-algo.so
index 6e78c74..9d155fa 100644
Binary files a/proprietary/vendor/lib64/libsdm-colormgr-algo.so and b/proprietary/vendor/lib64/libsdm-colormgr-algo.so differ
diff --git a/proprietary/vendor/lib64/libsdm-diag.so b/proprietary/vendor/lib64/libsdm-diag.so
index 088884f..097bca2 100644
Binary files a/proprietary/vendor/lib64/libsdm-diag.so and b/proprietary/vendor/lib64/libsdm-diag.so differ
diff --git a/proprietary/vendor/lib64/libsdsprpc.so b/proprietary/vendor/lib64/libsdsprpc.so
index 71a8eb1..15abdd4 100644
Binary files a/proprietary/vendor/lib64/libsdsprpc.so and b/proprietary/vendor/lib64/libsdsprpc.so differ
diff --git a/proprietary/vendor/lib64/libsecureui.so b/proprietary/vendor/lib64/libsecureui.so
index 10e1052..be0e484 100644
Binary files a/proprietary/vendor/lib64/libsecureui.so and b/proprietary/vendor/lib64/libsecureui.so differ
diff --git a/proprietary/vendor/lib64/libvpplibrary.so b/proprietary/vendor/lib64/libvpplibrary.so
index 2392325..92c51b6 100644
Binary files a/proprietary/vendor/lib64/libvpplibrary.so and b/proprietary/vendor/lib64/libvpplibrary.so differ
diff --git a/proprietary/vendor/lib64/libwms.so b/proprietary/vendor/lib64/libwms.so
index 9184db1..f1dcb1a 100644
Binary files a/proprietary/vendor/lib64/libwms.so and b/proprietary/vendor/lib64/libwms.so differ
diff --git a/proprietary/vendor/lib64/libwvhidl.so b/proprietary/vendor/lib64/libwvhidl.so
index 2f90912..bebca8b 100644
Binary files a/proprietary/vendor/lib64/libwvhidl.so and b/proprietary/vendor/lib64/libwvhidl.so differ
diff --git a/proprietary/vendor/lib64/libxml.so b/proprietary/vendor/lib64/libxml.so
index cbb0a6e..758c58c 100644
Binary files a/proprietary/vendor/lib64/libxml.so and b/proprietary/vendor/lib64/libxml.so differ
diff --git a/proprietary/vendor/lib64/libxtadapter.so b/proprietary/vendor/lib64/libxtadapter.so
index a7d7826..94a2c24 100644
Binary files a/proprietary/vendor/lib64/libxtadapter.so and b/proprietary/vendor/lib64/libxtadapter.so differ
diff --git a/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so b/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so
index a3007d0..93954e2 100644
Binary files a/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so and b/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libmisoundfx.so b/proprietary/vendor/lib64/soundfx/libmisoundfx.so
index 5dd4008..e4c5d59 100644
Binary files a/proprietary/vendor/lib64/soundfx/libmisoundfx.so and b/proprietary/vendor/lib64/soundfx/libmisoundfx.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so b/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so
index 8ddf862..cf2a3b9 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so and b/proprietary/vendor/lib64/vendor.qti.gnss@4.0-service.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so
deleted file mode 100644
index 66e00aa..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so and /dev/null differ
diff --git a/proprietary/vendor/radio/qcril_database/qcril.db b/proprietary/vendor/radio/qcril_database/qcril.db
index 4b536fc..7fe96a4 100644
Binary files a/proprietary/vendor/radio/qcril_database/qcril.db and b/proprietary/vendor/radio/qcril_database/qcril.db differ
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql b/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql
index 434d74d..bfa7437 100644
--- a/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql
+++ b/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql
@@ -8,819 +8,959 @@
 PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
 CREATE TABLE qcril_emergency_source_mcc_table(MCC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER));
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','100','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','101','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','102','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','1221','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('425','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','100','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','166','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('202','108','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('525','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('525','1777','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('426','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('426','997','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('426','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('432','112','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('432','110','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('432','115','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('432','125','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','104','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('418','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('416','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('416','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('419','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('422','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('422','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','997','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','998','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','991','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','992','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','996','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','116111','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','993','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','995','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','901','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','909','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('424','922','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('421','191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('421','194','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('401','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('401','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','15','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','16','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','114','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','117','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','130','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('410','1122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('736','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('736','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('730','133','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('730','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('730','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('901','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('901','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('404','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','191','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1669','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','199','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','112','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','911','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1154','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1554','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('520','1155','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('414','191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('414','192','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('414','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('515','112','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('515','911','','limited');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','113','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','125','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','111','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','117','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('450','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('454','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('454','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('454','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('454','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','120','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('460','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('852','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','113','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('510','129','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('452','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('502','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('502','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('502','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('405','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('310','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('302','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('302','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','192','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('456','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('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('457','1190','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','1191','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','1195','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','1199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','1623','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','1420','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('457','1169','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('706','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','120','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','123','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','125','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('704','128','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('429','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','199','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','113','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','114','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','029561967','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('470','029132023','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('234','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('505','000','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','120','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','121','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','122','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','123','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','126','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','129','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('602','180','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('260','08','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('260','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('260','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('230','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','911','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('208','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('272','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('272','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('420','997','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('420','998','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('420','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('420','993','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('621','119','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('621','767','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('639','999','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('639','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('213','110','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('213','115','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('213','116','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('213','117','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('213','118','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('213','175','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('213','181','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('250','112','','');
-INSERT INTO "qcril_emergency_source_mcc_table" VALUES('250','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('334','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('334','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','133','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('730','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('901','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('901','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','191','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','1669','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','199','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('520','112','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('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('414','911','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('414','112','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','119','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','120','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('460','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','9999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('852','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('452','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('452','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('502','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('502','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('502','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('310','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('310','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('302','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('302','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('456','117','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('456','118','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('456','119','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','191','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','192','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','199','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1191','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1190','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1195','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1199','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1196','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1168','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('706','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','123','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','119','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','125','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','128','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('704','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','100',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','101',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','102',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','108',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('429','112',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','100',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','101',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','102',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','108',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('470','112',NULL,NULL);
+INSERT INTO qcril_emergency_source_mcc_table VALUES('234','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('234','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('234','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('505','000','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('505','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('250','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('250','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('268','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('510','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('510','119','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('510','129','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('226','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('284','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('286','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('286','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('286','155','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('286','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('244','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('244','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('724','112','','');
+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('450','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('450','111','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('450','113','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('450','117','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('450','118','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('450','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('450','125','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('216','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('208','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('208','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('257','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('219','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('222','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('262','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('214','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('214','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('232','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('232','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('232','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('242','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('242','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('242','113','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('515','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('466','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('466','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('440','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('440','118','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('440','119','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('440','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('440','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('454','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('454','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('454','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('454','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('602','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('602','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('602','122','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('255','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('255','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('744','128','','');
+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('434','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('434','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('525','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('525','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('525','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('432','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('432','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('432','115','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('432','125','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('401','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('260','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('639','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('639','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('639','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('238','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('238','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('202','100','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('202','166','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('202','199','','limited');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('230','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','991','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','992','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','993','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','995','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','996','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','997','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','998','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','901','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','909','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('424','116111','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('604','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('604','15','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('604','19','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('604','177','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('604','150','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('604','190','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('455','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('455','993','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('455','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('455','120','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('455','119','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('427','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('427','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('427','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('427','135','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('370','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('370','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('228','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('228','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('736','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('736','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('736','110','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('240','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('240','112','','');
 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('410','15','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('410','16','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('410','115','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('410','130','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('410','1122','','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('460','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','119','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','120','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','999','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('466','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('466','119','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('852','999','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('460','122','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','191','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','1669','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','199','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','911','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','1154','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','1155','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('520','1554','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('515','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('515','911','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('515','8888','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','118','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','113','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','119','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('510','115','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('452','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('452','113','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('452','114','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('452','115','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('502','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('502','911','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('502','999','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('202','100','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('202','166','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('202','199','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('405','100','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('405','101','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('405','102','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','121','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','122','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','123','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','126','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','128','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','129','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','150','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','180','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('286','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('286','155','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('605','190','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('605','193','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('605','197','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('605','198','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('432','110','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('432','115','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('432','125','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('432','112','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('457','1190','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('457','1191','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('457','1195','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('457','1199','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('457','1623','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('457','1420','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('457','1169','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('604','15','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('604','19','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('604','177','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('604','150','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('604','190','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','991','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','992','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','996','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','116111','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','993','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','995','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','997','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','998','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','901','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','909','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('424','922','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','110','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','119','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','120','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','112','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('460','999','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('422','9999','','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('510','119','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('510','129','','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('286','110','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('286','155','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('466','118','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('602','123','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('602','180','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('602','126','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('456','117','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('456','118','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('456','119','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('704','122','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('704','123','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('704','119','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('704','110','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('704','125','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('704','128','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('432','110','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('432','115','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('432','125','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('202','100','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('202','166','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('202','199','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','991','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','992','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','996','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','116111','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','993','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','995','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','997','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','998','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','901','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('424','909','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('604','15','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('604','19','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('604','177','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('604','150','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('604','190','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('410','15','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('410','1122','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('410','115','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('410','130','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('410','16','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('410','114','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1191','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1190','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1195','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1199','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1196','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1168','','full');
 CREATE TABLE qcril_emergency_source_hard_mcc_table(MCC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER));
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','120','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','118','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','111','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','113','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','117','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','125','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('450','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('466','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('466','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('852','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('460','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('404','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','1669','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','1554','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','1154','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('520','1155','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('414','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('414','192','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('414','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('515','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('515','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('515','8888','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','118','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','113','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','115','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('510','129','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('452','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('502','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('502','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('502','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('405','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('310','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('310','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('310','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('302','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('302','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('302','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('456','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('456','192','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('456','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('457','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('457','192','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('457','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('730','133','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('429','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('429','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','029561967','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('470','029132023','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('234','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('234','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('234','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','08','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','000','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('222','118','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('214','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('268','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('204','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('272','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('272','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('216','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('230','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('655','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('655','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('286','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('226','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('226','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('206','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('260','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('260','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','150','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','155','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('231','158','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('214','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('208','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('208','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('334','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('334','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('732','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('732','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('732','133','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('716','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('716','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','190','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','192','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('724','193','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('722','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('722','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('722','100','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('722','107','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('736','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('736','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('730','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('730','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('712','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('712','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('740','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('740','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('706','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('706','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('704','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('704','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('710','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('710','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('714','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('714','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('748','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('748','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('734','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('734','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','000','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','08','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','118','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','119','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('262','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('250','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('250','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','100','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','166','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('202','199','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('525','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('525','1777','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('426','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('426','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('426','997','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('432','110','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('432','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('432','115','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('432','125','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','115','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','104','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('418','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('416','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('416','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('419','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('422','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('422','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('424','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('424','997','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('424','998','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('424','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('421','191','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('421','194','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('401','101','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('401','102','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('401','103','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('401','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('744','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('744','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','120','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','121','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','122','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','123','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','126','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','128','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','129','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','150','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','180','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','100','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','101','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','102','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','1221','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('639','999','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('257','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','911','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('425','112','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('716','105','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','120','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('852','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('460','122','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','191','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','192','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','199','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('414','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','113','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','114','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','115','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('452','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('310','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('310','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('310','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('302','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('302','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('302','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','133','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','100',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','101',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','102',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','108',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('429','112',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','100',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','101',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','102',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','108',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('470','112',NULL,NULL);
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','111','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','113','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','117','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','122','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('450','125','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('268','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('204','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('272','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('216','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('655','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('655','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('286','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('286','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('260','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('260','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('231','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('231','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('214','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('334','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('716','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('716','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('724','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('724','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('724','190','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('722','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('722','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('730','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('712','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('712','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('740','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('740','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('706','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('706','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('704','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('710','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('710','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('714','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('714','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('734','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('734','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('262','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('250','122','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('250','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('244','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('244','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('244','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('244','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('244','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('244','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('244','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('244','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('257','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('232','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('242','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('242','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('242','113','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('466','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('466','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('466','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('466','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('440','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('440','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('440','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('440','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('440','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('440','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('440','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('440','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('454','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('454','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('454','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('454','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','128','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('744','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('434','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('434','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('432','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('432','115','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('432','125','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('432','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','113','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','115','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('510','129','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('639','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('604','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('455','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('455','993','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('455','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('455','120','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('455','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('427','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('427','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('427','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('505','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('505','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','999','','');
 CREATE TABLE qcril_emergency_source_nw_table(MCC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER));
 CREATE TABLE qcril_emergency_source_escv_iin_table(IIN TEXT, NUMBER TEXT, ESCV INTEGER, ROAM TEXT, PRIMARY KEY(IIN,NUMBER,ROAM));
 CREATE TABLE qcril_emergency_source_escv_nw_table(MCC TEXT, MNC TEXT, NUMBER TEXT, ESCV INTEGER, PRIMARY KEY(MCC,NUMBER, ESCV));
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','111',7);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','112',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','113',3);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','117',18);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','118',19);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','119',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','122',8);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','125',9);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('450','','911',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('414','','191',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('414','','192',2);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('414','','199',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('466','05','110',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('466','05','112',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('466','05','119',2);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('202','','112',0);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('202','','100',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('202','','199',4);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('202','','166',2);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('716','06','105',1);
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('432','','110','1');
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('432','','115','2');
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('432','','125','4');
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('432','','112','0');
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('257','01','101','4');
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('257','01','102','1');
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('257','01','103','2');
-INSERT INTO "qcril_emergency_source_escv_nw_table" VALUES('257','01','104','8');
+INSERT INTO qcril_emergency_source_escv_nw_table VALUES('257','01','101',4);
+INSERT INTO qcril_emergency_source_escv_nw_table VALUES('257','01','102',1);
+INSERT INTO qcril_emergency_source_escv_nw_table VALUES('257','01','103',2);
+INSERT INTO qcril_emergency_source_escv_nw_table VALUES('257','01','104',8);
 CREATE TABLE qcril_emergency_source_mcc_mnc_table(MCC TEXT, MNC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER,MNC));
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('232','05','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('232','10','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('232','14','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','20','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','20','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','15','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','15','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','15','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','99','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('222','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('214','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('268','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('204','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('216','70','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('655','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('655','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('286','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('226','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('226','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','103','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('206','10','110','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('260','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('260','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','150','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','155','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','01','158','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','06','155','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','06','158','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('231','06','150','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('214','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('214','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('208','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('208','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','020','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','020','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','101','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','20','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','20','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','20','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','192','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','193','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','128','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','153','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','180','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','185','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','188','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','191','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','194','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','197','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','198','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','05','199','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','192','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','193','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','12','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','192','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','193','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','38','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','07','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','07','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','070','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','070','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','310','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','310','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','310','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','310','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','330','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','330','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','330','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','330','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','320','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','320','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','320','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('722','320','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','02','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','03','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','001','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','001','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','001','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','102','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','102','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','102','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','103','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','111','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','123','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','123','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','123','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','10','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','10','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('732','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('712','04','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('712','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','00','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','00','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','04','122','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','01','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('706','01','122','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','03','122','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','030','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','030','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','30','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','30','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','300','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','300','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73','115','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73','128','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','73','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','103','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','104','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','106','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','107','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','108','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','109','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','133','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','141','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','155','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','311','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','06','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','06','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','06','105','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','07','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','07','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','10','104','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('748','10','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('734','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('262','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','30','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','30','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','33','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('234','33','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','113','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','114','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','115','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','199','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','029132023','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('470','01','029561967','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('525','05','999','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('744','02','128','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('744','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','100','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','111','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','113','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','116','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','195','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','198','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','199','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','119','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('704','01','110','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('714','03','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('712','03','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','001','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','001','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('708','001','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','21','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('710','21','118','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','23','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('730','23','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('716','10','119','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('330','110','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('370','02','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('525','05','995','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('724','02','190','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('334','020','066','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('257','01','101','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('257','01','102','','limited');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('257','01','103','','limited');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('257','01','104','','limited');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('257','01','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('257','01','911','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('257','02','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('257','04','112','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('510','01','123','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('510','11','115','','');
-INSERT INTO "qcril_emergency_source_mcc_mnc_table" VALUES('510','11','117','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','88','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','99','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','1530','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('268','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('204','04','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('272','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('272','01','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('216','70','107','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('216','70','105','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('216','70','104','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('216','30','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('216','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('655','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('206','10','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('231','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('231','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','101','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','101','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','10','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','10','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','10','105','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','07','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','07','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','10','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','10','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','070','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('722','070','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','111','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','111','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','111','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','103','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','103','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','103','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','165','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','165','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','165','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','123','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','123','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','123','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','130','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('732','360','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('712','04','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('712','04','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('740','00','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('740','00','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('706','04','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('706','04','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('706','04','122','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('710','30','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('710','30','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('710','300','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('710','300','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('714','02','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('714','02','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','06','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','06','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','06','105','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','17','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','17','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('748','07','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('748','07','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('748','10','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('262','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','07','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','11','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('262','01','258','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','840','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','840','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','840','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','840','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','854','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','854','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','854','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','854','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','855','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','855','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','855','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','855','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','856','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','856','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','856','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','856','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','857','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','857','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','857','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','857','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','858','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','858','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','858','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','858','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','859','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','859','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','859','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','859','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','860','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','860','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','860','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','860','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','861','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','861','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','861','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','861','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','862','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','862','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','862','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','862','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','863','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','863','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','863','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','863','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','864','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','864','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','864','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','864','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','865','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','865','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','865','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','865','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','866','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','866','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','866','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','866','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','867','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','867','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','867','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','867','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','868','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','868','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','868','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','868','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','869','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','869','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','869','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','869','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','870','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','870','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','870','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','870','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','871','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','871','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','871','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','871','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','872','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','872','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','872','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','872','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','873','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','873','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','873','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','873','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','874','100','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','874','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','874','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('405','874','108','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('284','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('284','03','150','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('284','03','160','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('284','03','166','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('219','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','09','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','09','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','09','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','09','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','09','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','09','129','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','28','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','28','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','28','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','28','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','28','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','28','129','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','10','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','10','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','10','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','10','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','10','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','10','129','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','01','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','01','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','01','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','01','123','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','01','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','01','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','01','129','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','11','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','11','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','11','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','11','117','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','11','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','11','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','11','129','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','89','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','89','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','89','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','89','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','89','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('510','89','129','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','02','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','02','114','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','02','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','04','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','04','114','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','04','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','01','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','01','114','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('452','01','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','97','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','97','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','97','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','05','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','05','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','05','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','12','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','12','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','12','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','92','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','92','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','92','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','11','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','11','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','11','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','01','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','01','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','01','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','02','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','02','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','02','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','89','110','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','89','119','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('466','89','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('255','06','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('255','06','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('255','06','103','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','103','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','104','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('520','18','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('520','05','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('520','47','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('639','02','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('639','03','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('639','07','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('639','10','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('230','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','04','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','04','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','01','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','01','998','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','01','997','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','01','996','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','01','994','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','03','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','03','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','03','999','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','03','998','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','03','997','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','03','996','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('420','03','994','','');
 CREATE TABLE qcril_emergency_source_voice_mcc_mnc_table(MCC TEXT, MNC TEXT, NUMBER TEXT, IMS_ADDRESS TEXT, SERVICE TEXT, PRIMARY KEY(MCC,NUMBER,MNC));
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('284','03','150','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('284','03','160','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('284','03','166','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','01','191','','4');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','01','192','','2');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','01','199','','1');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','09','191','','4');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','09','192','','2');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','09','199','','1');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','06','191','','4');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','06','192','','2');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('414','06','199','','1');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','01','117','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','01','118','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','01','119','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','06','117','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','06','118','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','06','119','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','08','117','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','08','118','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','08','119','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','11','117','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','11','118','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('456','11','119','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('722','310','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('722','310','101','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('722','310','107','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('748','10','104','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('744','02','128','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','128','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','153','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','180','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','181','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','185','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','188','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','190','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','191','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','192','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','193','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','194','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','197','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','198','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('724','05','199','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','120','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','122','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','123','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','125','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('704','01','128','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('706','01','133','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('706','01','122','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('714','03','103','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('714','03','104','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','111','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','113','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','116','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','195','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','198','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('708','001','199','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('710','21','115','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('710','21','128','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('716','10','105','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('257','01','102','','full');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('257','01','103','','full');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('257','01','104','','full');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','03','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','03','101','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','03','102','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','03','1221','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','01','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','01','101','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','01','102','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','01','1221','',''); 
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','02','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','02','101','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','02','102','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','02','1221','',''); 
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','77','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','77','101','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','77','102','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','77','1221','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','09','100','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','09','101','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','09','102','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('425','09','1221','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('510','01','123','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('510','01','115','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('510','01','119','','');
-INSERT INTO "qcril_emergency_source_voice_mcc_mnc_table" VALUES('510','11','117','','');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','840','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','840','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','840','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','840','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','854','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','854','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','854','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','854','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','855','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','855','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','855','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','855','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','856','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','856','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','856','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','856','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','857','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','857','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','857','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','857','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','858','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','858','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','858','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','858','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','859','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','859','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','859','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','859','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','860','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','860','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','860','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','860','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','861','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','861','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','861','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','861','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','862','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','862','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','862','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','862','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','863','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','863','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','863','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','863','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','864','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','864','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','864','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','864','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','865','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','865','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','865','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','865','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','866','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','866','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','866','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','866','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','867','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','867','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','867','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','867','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','868','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','868','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','868','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','868','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','869','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','869','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','869','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','869','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','870','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','870','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','870','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','870','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','871','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','871','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','871','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','871','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','872','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','872','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','872','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','872','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','873','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','873','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','873','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','873','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','874','100','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','874','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','874','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('405','874','108','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('284','03','150','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('284','03','160','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('284','03','166','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('452','04','113','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('452','04','114','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('452','04','115','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('452','01','113','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('452','01','114','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('452','01','115','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','09','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','09','129','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','28','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','28','129','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','10','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','10','129','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','10','110','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','10','115','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','01','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','01','129','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','01','115','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','01','123','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','11','117','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','11','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','11','129','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','89','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','89','129','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','92','110','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','92','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','11','110','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','11','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','01','110','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','01','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','02','110','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','02','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','89','110','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('466','89','119','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('255','06','101','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('255','06','102','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('255','06','103','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('230','01','150','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('230','01','155','','full');
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('230','01','158','','full');
 CREATE TABLE qcril_properties_table (property TEXT,value TEXT, PRIMARY KEY(property));
-INSERT INTO qcril_properties_table VALUES('qcrildb_version','3');
+INSERT INTO qcril_properties_table VALUES('qcrildb_version','5');
 CREATE TABLE qcril_operator_specific_config(MCC TEXT, MNC TEXT, WPS_OVER_CS INTEGER, PRIMARY KEY(MCC, MNC));
 INSERT INTO qcril_operator_specific_config VALUES('310','410',1);
 DELETE FROM qcril_operator_specific_config where MCC = '310' AND MNC = '410';
@@ -830,4 +970,180 @@ INSERT INTO qcril_cdma_operator_specific_config VALUES('460','11',1);
 INSERT INTO qcril_cdma_operator_specific_config VALUES('454','03',1);
 INSERT INTO qcril_cdma_operator_specific_config VALUES('454','31',1);
 INSERT INTO qcril_cdma_operator_specific_config VALUES('204','04',1);
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '100';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '840' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '854' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '855' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '856' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '857' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '858' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '859' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '860' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '861' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '862' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '863' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '864' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '865' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '866' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '867' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '868' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '869' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '870' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '871' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '872' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '873' AND NUMBER = '108';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '101';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '102';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '108';
 COMMIT;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql
deleted file mode 100644
index 241cddf..0000000
--- a/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-  Copyright (c) 2021 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
-*/
-
-BEGIN TRANSACTION;
-
-INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 10);
-
-INSERT INTO qcril_emergency_source_mcc_table VALUES('235','999','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('530','111','','');
-
-INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('235','999','','');
-
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/31_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/31_version_update_ecc_table.sql
new file mode 100644
index 0000000..97c2b82
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/31_version_update_ecc_table.sql
@@ -0,0 +1,33 @@
+/*
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 31);
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '219' AND NUMBER = '911';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '219' AND NUMBER = '112';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '219' AND NUMBER = '000';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '219' AND NUMBER = '08';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '219' AND NUMBER = '110';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '219' AND NUMBER = '119';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '219' AND NUMBER = '999';
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '219' AND MNC = '01' AND NUMBER = '112';
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('219','01','112','','');
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '219' AND MNC = '01' AND NUMBER = '000';
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('219','01','000','','');
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '219' AND MNC = '01' AND NUMBER = '08';
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('219','01','08','','');
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '219' AND MNC = '01' AND NUMBER = '110';
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('219','01','110','','');
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '219' AND MNC = '01' AND NUMBER = '119';
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('219','01','119','','');
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '219' AND MNC = '01' AND NUMBER = '999';
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('219','01','999','','');
+
+COMMIT TRANSACTION;
+
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/32_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/32_version_update_ecc_table.sql
new file mode 100644
index 0000000..bca1a48
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/32_version_update_ecc_table.sql
@@ -0,0 +1,42 @@
+/*
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 32);
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '639' AND NUMBER = '112';
+INSERT INTO qcril_emergency_source_mcc_table VALUES('639','112','','');
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '639' AND NUMBER = '911';
+INSERT INTO qcril_emergency_source_mcc_table VALUES('639','911','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '639' AND NUMBER = '999';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('639','999','','');
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '238' AND NUMBER = '112';
+INSERT INTO qcril_emergency_source_mcc_table VALUES('238','112','','');
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '238' AND NUMBER = '911';
+INSERT INTO qcril_emergency_source_mcc_table VALUES('238','911','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '238' AND NUMBER = '999';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','999','','');
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '238' AND NUMBER = '911';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','911','','');
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '238' AND NUMBER = '112';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','112','','');
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '238' AND NUMBER = '000';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','000','','');
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '238' AND NUMBER = '08';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','08','','');
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '238' AND NUMBER = '110';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','110','','');
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '238' AND NUMBER = '118';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','118','','');
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '238' AND NUMBER = '119';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('238','119','','');
+
+COMMIT TRANSACTION;
+
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/33_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/33_version_update_ecc_table.sql
new file mode 100644
index 0000000..83231a0
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/33_version_update_ecc_table.sql
@@ -0,0 +1,25 @@
+/*
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 33);
+
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '422' AND MNC = '02' AND NUMBER = '999';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '422' AND MNC = '03' AND NUMBER = '999';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '422' AND NUMBER = '112';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '422' AND NUMBER = '911';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '422' AND NUMBER = '999';
+DELETE FROM qcril_emergency_source_voice_table where MCC = '422' AND NUMBER = '9999';
+
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','999','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('422','9999','','full');
+
+COMMIT TRANSACTION;
+
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/34_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/34_version_update_ecc_table.sql
new file mode 100644
index 0000000..da6f7dd
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/34_version_update_ecc_table.sql
@@ -0,0 +1,114 @@
+/*
+  Copyright (c) 2023 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 34);
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '427';
+INSERT INTO qcril_emergency_source_mcc_table VALUES('427','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('427','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('427','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('427','135','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '427';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('427','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('427','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('427','999','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '206';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','999','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('206','119','','');
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '505';
+INSERT INTO qcril_emergency_source_mcc_table VALUES('505','000','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('505','112','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '505';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('505','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('505','112','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '222' AND number = '118';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '222' AND number = '119';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('222','119','','');
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '222' AND MNC = '10';
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','113','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','115','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','118','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('222','10','1530','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '748';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('748','999','','');
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '748' AND MNC = '10';
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('748','10','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('748','10','112','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '457';
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '457';
+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('457','1191','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1190','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1195','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1199','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1196','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('457','1168','','');
+
+DELETE FROM qcril_emergency_source_voice_table where MCC = '457';
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1191','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1190','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1195','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1199','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1196','','full');
+INSERT INTO qcril_emergency_source_voice_table VALUES('457','1168','','full');
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '370';
+INSERT INTO qcril_emergency_source_mcc_table VALUES('370','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('370','112','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '370';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('370','999','','');
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '228';
+INSERT INTO qcril_emergency_source_mcc_table VALUES('228','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('228','112','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '228';
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('228','999','','');
+
+COMMIT TRANSACTION;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/35_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/35_version_update_ecc_table.sql
new file mode 100644
index 0000000..07da72c
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/35_version_update_ecc_table.sql
@@ -0,0 +1,36 @@
+/*
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 35);
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '911';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '000';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '08';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '110';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '118';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '119';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '999';
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '716' AND MNC = '17' AND NUMBER = '105';
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '639' AND NUMBER = '999';
+
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('230','999','','');
+
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('716','17','105','','');
+
+INSERT INTO qcril_emergency_source_mcc_table VALUES('639','999','','');
+
+COMMIT TRANSACTION;
+
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/36_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/36_version_update_ecc_table.sql
new file mode 100644
index 0000000..704e820
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/36_version_update_ecc_table.sql
@@ -0,0 +1,31 @@
+/*
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 36);
+
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '736';
+
+INSERT INTO qcril_emergency_source_mcc_table VALUES('736','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('736','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('736','110','','');
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '219';
+
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('219','999','','');
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '219' AND MNC = '01';
+
+COMMIT TRANSACTION;
+
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/37_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/37_version_update_ecc_table.sql
new file mode 100644
index 0000000..aee2d44
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/37_version_update_ecc_table.sql
@@ -0,0 +1,27 @@
+/*
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 37);
+
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '422' AND MNC = '02' AND NUMBER = '999';
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '422' AND MNC = '03' AND NUMBER = '999';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '422' AND NUMBER = '112';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '422' AND NUMBER = '911';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '422' AND NUMBER = '999';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '422' AND NUMBER = '9999';
+DELETE FROM qcril_emergency_source_voice_table where MCC = '422' AND NUMBER = '9999';
+
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','112','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','999','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('422','9999','','');
+INSERT INTO qcril_emergency_source_voice_table VALUES('422','9999','','full');
+
+COMMIT TRANSACTION;
+
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/38_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/38_version_update_ecc_table.sql
new file mode 100644
index 0000000..fe923bf
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/38_version_update_ecc_table.sql
@@ -0,0 +1,17 @@
+/*
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 38);
+
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '510' AND MNC = '11' AND NUMBER = '117';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '510' AND MNC = '89' AND NUMBER = '118';
+
+INSERT INTO qcril_emergency_source_voice_mcc_mnc_table VALUES('510','11','117','','full');
+
+COMMIT TRANSACTION;
+
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/39_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/39_version_update_ecc_table.sql
new file mode 100644
index 0000000..9c6ef6f
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/39_version_update_ecc_table.sql
@@ -0,0 +1,33 @@
+/*
+  Copyright (c) 2023 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 39);
+
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '257';
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '257';
+DELETE FROM qcril_emergency_source_escv_nw_table where MCC = '257';
+DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '257';
+
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('257','112','','');
+
+INSERT INTO qcril_emergency_source_escv_nw_table VALUES('257','01','101',4);
+INSERT INTO qcril_emergency_source_escv_nw_table VALUES('257','01','102',1);
+INSERT INTO qcril_emergency_source_escv_nw_table VALUES('257','01','103',2);
+INSERT INTO qcril_emergency_source_escv_nw_table VALUES('257','01','104',8);
+
+
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','101','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','102','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','103','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','104','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','01','911','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','02','112','','');
+INSERT INTO qcril_emergency_source_mcc_mnc_table VALUES('257','04','112','','');
+
+COMMIT TRANSACTION;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/40_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/40_version_update_ecc_table.sql
new file mode 100644
index 0000000..8c1747b
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/40_version_update_ecc_table.sql
@@ -0,0 +1,26 @@
+/*
+  Copyright (c) 2023 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 40);
+
+
+DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '240';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '240';
+
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','112','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','911','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','000','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','08','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','110','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','118','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','119','','');
+INSERT INTO qcril_emergency_source_hard_mcc_table VALUES('240','999','','');
+
+INSERT INTO qcril_emergency_source_mcc_table VALUES('240','911','','');
+INSERT INTO qcril_emergency_source_mcc_table VALUES('240','112','','');
+
+COMMIT TRANSACTION;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/41_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/41_version_update_ecc_table.sql
new file mode 100644
index 0000000..f2e9594
--- /dev/null
+++ b/proprietary/vendor/radio/qcril_database/upgrade/41_version_update_ecc_table.sql
@@ -0,0 +1,14 @@
+/*
+  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+BEGIN TRANSACTION;
+
+INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 41);
+
+DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '716' AND MNC = '17' AND NUMBER = '105';
+
+COMMIT TRANSACTION;
+
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql
index 29dccfb..6ad2990 100644
--- a/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql
+++ b/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql
@@ -141,25 +141,4 @@ DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC
 DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '102';
 DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '405' AND MNC = '874' AND NUMBER = '108';
 
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '222' AND NUMBER = '118';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '222' AND NUMBER = '119';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '260' AND NUMBER = '997';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '260' AND NUMBER = '998';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '260' AND NUMBER = '999';
-DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '260' AND NUMBER = '997';
-DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '260' AND NUMBER = '998';
-DELETE FROM qcril_emergency_source_voice_mcc_mnc_table where MCC = '260' AND NUMBER = '999';
-DELETE FROM qcril_emergency_source_escv_nw_table where MCC = '262' AND NUMBER = '110';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '262' AND NUMBER = '110';
-DELETE FROM qcril_emergency_source_voice_table where MCC = '262' AND NUMBER = '110';
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('262','110','','full');
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '230' AND MNC = '03' AND NUMBER = '150';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '230' AND MNC = '03' AND NUMBER = '155';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '230' AND MNC = '03' AND NUMBER = '158';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '230' AND NUMBER = '150';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '230' AND NUMBER = '155';
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '230' AND NUMBER = '158';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '150';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '155';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '230' AND NUMBER = '158';
 COMMIT TRANSACTION;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql
index d2c877f..5fd1fa9 100644
--- a/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql
+++ b/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql
@@ -9,7 +9,5 @@ BEGIN TRANSACTION;
 INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 6);
 
 DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '262' AND NUMBER = '110';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '730' AND MNC = '02' AND NUMBER = '131';
-DELETE FROM qcril_emergency_source_mcc_mnc_table where MCC = '730' AND MNC = '02' AND NUMBER = '132';
 
 COMMIT TRANSACTION;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
deleted file mode 100644
index 3054011..0000000
--- a/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-  Copyright (c) 2020 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
-*/
-
-BEGIN TRANSACTION;
-
-INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 7);
-
-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','','');
-
-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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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','','');
-
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '602';
-DELETE FROM qcril_emergency_source_voice_table where MCC = '602';
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','121','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','122','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','123','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','126','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','128','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','129','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','150','','full');
-INSERT INTO "qcril_emergency_source_voice_table" VALUES('602','180','','full');
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '602' AND NUMBER = '120';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '602' AND NUMBER = '128';
-DELETE FROM qcril_emergency_source_hard_mcc_table where MCC = '602' AND NUMBER = '150';
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','128','','');
-INSERT INTO "qcril_emergency_source_hard_mcc_table" VALUES('602','150','','');
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql b/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql
deleted file mode 100644
index 8c53dbe..0000000
--- a/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  Copyright (c) 2021 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
-*/
-
-BEGIN TRANSACTION;
-
-INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 8);
-INSERT INTO qcril_emergency_source_mcc_table VALUES('204','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('206','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('214','911','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('214','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('216','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('222','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('222','911','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('226','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('226','911','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('230','150','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('230','155','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('230','158','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('231','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('231','911','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('234','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('234','911','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('262','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('268','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('286','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('302','999','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('310','999','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '414' AND NUMBER = '191';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('414','191','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '414' AND NUMBER = '192';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('414','192','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '414' AND NUMBER = '199';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('414','199','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '515' AND NUMBER = '117';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('515','117','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '515' AND NUMBER = '192';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('515','192','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '515' AND NUMBER = '911';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('515','911','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '520' AND NUMBER = '191';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('520','191','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '520' AND NUMBER = '1669';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('520','1669','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '520' AND NUMBER = '199';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('520','199','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '520' AND NUMBER = '112';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('520','112','','');
-DELETE FROM qcril_emergency_source_mcc_table where MCC = '520' AND NUMBER = '911';
-INSERT INTO qcril_emergency_source_mcc_table VALUES('520','911','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('655','112','','');
-INSERT INTO qcril_emergency_source_mcc_table VALUES('655','911','','');
-COMMIT TRANSACTION;
diff --git a/proprietary/vendor/radio/qcril_database/upgrade/9_version_update_ecc_table_127531.sql b/proprietary/vendor/radio/qcril_database/upgrade/9_version_update_ecc_table_127531.sql
deleted file mode 100644
index bdd78c7..0000000
--- a/proprietary/vendor/radio/qcril_database/upgrade/9_version_update_ecc_table_127531.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-  Copyright (c) 2019 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
-*/
-
-BEGIN TRANSACTION;
-
-INSERT OR REPLACE INTO qcril_properties_table (property, value) VALUES ('qcrildb_version', 8);
-
-DELETE FROM qcril_emergency_source_escv_nw_table WHERE MCC = '255' AND NUMBER = '101';
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('255','','101',4);
-
-DELETE FROM qcril_emergency_source_escv_nw_table WHERE MCC = '255' AND NUMBER = '102';
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('255','','102',1);
-
-DELETE FROM qcril_emergency_source_escv_nw_table WHERE MCC = '255' AND NUMBER = '103';
-INSERT INTO qcril_emergency_source_escv_nw_table VALUES('255','','103',2);
-
-COMMIT TRANSACTION;
diff --git a/surya-vendor.mk b/surya-vendor.mk
index 21f4280..988217e 100644
--- a/surya-vendor.mk
+++ b/surya-vendor.mk
@@ -134,6 +134,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/vppservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vppservice.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
     vendor/xiaomi/surya/proprietary/vendor/etc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \
+    vendor/xiaomi/surya/proprietary/vendor/etc/libnfc-nxp_RF.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp_RF.conf \
     vendor/xiaomi/surya/proprietary/vendor/etc/permissions/com.fingerprints.extension.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.fingerprints.extension.xml \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/codec2.vendor.base.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.base.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/codec2.vendor.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext.policy \
@@ -258,19 +259,25 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/vendor/lib64/camera/fdconfigpreviewlite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigpreviewlite.bin \
     vendor/xiaomi/surya/proprietary/vendor/lib64/camera/fdconfigvideo.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideo.bin \
     vendor/xiaomi/surya/proprietary/vendor/lib64/camera/fdconfigvideolite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideolite.bin \
-    vendor/xiaomi/surya/proprietary/vendor/libnfc-nxp_RF.conf:$(TARGET_COPY_OUT_VENDOR)/libnfc-nxp_RF.conf \
     vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db \
     vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/0_initial.sql \
-    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/10_version_update_ecc_table.sql \
     vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/1_version_intro.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/1_version_intro.sql \
     vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/2_version_add_wps_config.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/2_version_add_wps_config.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/31_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/31_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/32_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/32_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/33_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/33_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/34_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/34_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/35_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/35_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/36_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/36_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/37_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/37_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/38_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/38_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/39_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/39_version_update_ecc_table.sql \
     vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/3_version_update_wps_config.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/3_version_update_wps_config.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/40_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/40_version_update_ecc_table.sql \
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/41_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/41_version_update_ecc_table.sql \
     vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/4_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/4_version_update_ecc_table.sql \
     vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/5_version_update_ecc_table.sql \
-    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/6_version_update_ecc_table.sql \
-    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/7_version_update_ecc_table.sql \
-    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/8_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/8_version_update_ecc_table.sql \
-    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/9_version_update_ecc_table_127531.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/9_version_update_ecc_table_127531.sql
+    vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/6_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/6_version_update_ecc_table.sql
 
 PRODUCT_PACKAGES += \
     eglSubDriverAndroid \
@@ -668,7 +675,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.radio.internal.deviceinfo@1.0 \
     vendor.qti.hardware.radio.lpa@1.0 \
     vendor.qti.hardware.radio.lpa@1.1 \
-    vendor.qti.hardware.radio.lpa@1.2 \
     vendor.qti.hardware.radio.qcrilhook@1.0 \
     vendor.qti.hardware.radio.qtiradio@1.0 \
     vendor.qti.hardware.radio.qtiradio@2.0 \
@@ -743,6 +749,7 @@ PRODUCT_PACKAGES += \
     vendor.qti.diaghal@1.0 \
     vendor.qti.hardware.fm@1.0 \
     vendor.qti.imsrtpservice@3.0 \
+    vendor.qti.imsrtpservice@3.1 \
     CACertService \
     CneApp \
     IWlanService \