fogos: Import blobs & firmware from U1UGS34.23-110-23-4

Change-Id: I3e4ae269ff5083235cd6961fb273ed427cf0b227

.gitattributes

@@ -0,0 +1 @@
+radio/* filter=lfs diff=lfs merge=lfs -text

.lfsconfig

@@ -0,0 +1,3 @@
+[lfs]
+    url = "https://lfs.undocumented.software/lfs/blobs.git/info/lfs"
+    pushurl = "ssh://git@lfs.undocumented.software/lfs/blobs.git"

Android.bp

@@ -5,7 +5,7 @@
 soong_namespace {
     imports: [
         "hardware/motorola",
-        "vendor/motorola/knoir",
+        "vendor/motorola/sm6375-common",
         "vendor/qcom/opensource/display",
     ],
 }
@@ -724,7 +724,7 @@ cc_prebuilt_library_shared {
                 "libmot_chi_desktop_helper",
                 "libutils",
                 "libcutils",
-                "libui-v34",
+                "libui",
                 "libc2d_helper",
                 "liblog",
                 "libc++",
@@ -1012,7 +1012,7 @@ cc_prebuilt_library_shared {
                 "libcamximageformatutils",
                 "libchilog",
                 "libcom.qti.chinodeutils",
-                "libui-v34",
+                "libui",
                 "libz",
                 "libc",
                 "libm",
@@ -2358,7 +2358,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libvidhance",
                 "libsensorslog",
-                "libui-v34",
+                "libui",
                 "libc++",
                 "libc",
                 "libm",
@@ -2390,7 +2390,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libvidhance",
                 "libsensorslog",
-                "libui-v34",
+                "libui",
                 "libc++",
                 "libc",
                 "libm",
@@ -5941,6 +5941,30 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libos",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libos.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libportrait_repair_ppl3_ocl",
     owner: "motorola",
@@ -5965,6 +5989,37 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libpowercore",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libpowercore.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "libutils",
+                "liblog",
+                "libbinder",
+                "libtinyxml2",
+                "vendor.display.config@1.0",
+                "libhidlbase",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libqll10",
     owner: "motorola",
@@ -6100,6 +6155,33 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libsynx",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libsynx.so",
+            ],
+            shared_libs: [
+                "libos",
+                "libthreadutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libtfestriping",
     owner: "motorola",
@@ -6152,6 +6234,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libthreadutils",
+    owner: "motorola",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libthreadutils.so",
+            ],
+            shared_libs: [
+                "libos",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libvidhance",
     owner: "motorola",
@@ -6436,17 +6543,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-android_app_import {
-    name: "MotoSignatureApp",
-    owner: "motorola",
-    apk: "proprietary/system/app/MotoSignatureApp/MotoSignatureApp.apk",
-    preprocessed: true,
-    presigned: true,
-    dex_preopt: {
-        enabled: false,
-    },
-}
-
 android_app_import {
     name: "EuiccPartnerApp",
     owner: "motorola",
@@ -6458,22 +6554,6 @@ android_app_import {
     product_specific: true,
 }
 
-android_app_import {
-    name: "MotCamera3AI",
-    owner: "motorola",
-    apk: "proprietary/product/app/MotCamera3AI/MotCamera3AI.apk",
-    overrides: [
-        "Camera2",
-        "Aperture",
-    ],
-    preprocessed: true,
-    presigned: true,
-    dex_preopt: {
-        enabled: false,
-    },
-    product_specific: true,
-}
-
 android_app_import {
     name: "EuiccGoogle",
     owner: "motorola",
@@ -6510,55 +6590,6 @@ android_app_import {
     product_specific: true,
 }
 
-android_app_import {
-    name: "MotCamera4",
-    owner: "motorola",
-    apk: "proprietary/product/priv-app/MotCamera4/MotCamera4.apk",
-    preprocessed: true,
-    presigned: true,
-    dex_preopt: {
-        enabled: false,
-    },
-    privileged: true,
-    product_specific: true,
-}
-
-android_app_import {
-    name: "MotorolaSettingsProvider",
-    owner: "motorola",
-    apk: "proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk",
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    privileged: true,
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "com.motorola.motosignature",
-    owner: "motorola",
-    jars: [
-        "proprietary/system/framework/com.motorola.motosignature.jar",
-    ],
-}
-
-dex_import {
-    name: "moto-core_services",
-    owner: "motorola",
-    jars: [
-        "proprietary/system/framework/moto-core_services.jar",
-    ],
-}
-
-dex_import {
-    name: "moto-settings",
-    owner: "motorola",
-    jars: [
-        "proprietary/system/framework/moto-settings.jar",
-    ],
-}
-
 dex_import {
     name: "com.android.hotwordenrollment.common.util",
     owner: "motorola",
@@ -6767,11 +6798,3 @@ cc_prebuilt_binary {
     relative_install_path: "hw",
     soc_specific: true,
 }
-
-sh_binary {
-    name: "motsettings",
-    owner: "motorola",
-    src: "proprietary/system_ext/bin/motsettings",
-    filename: "motsettings",
-    system_ext_specific: true,
-}

Android.mk

@@ -3,3 +3,25 @@
 #
 
 LOCAL_PATH := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),fogos)
+
+$(call add-radio-file-sha1-checked,radio/abl.img,73c13059616831863cdc604fe09d140eb89cdfe3)
+$(call add-radio-file-sha1-checked,radio/bluetooth.img,0c208b1c7dadcbcc40ed886f9ecb18d062f37a5f)
+$(call add-radio-file-sha1-checked,radio/devcfg.img,46ba86f287f382e6674994d6d13ed83590da9874)
+$(call add-radio-file-sha1-checked,radio/dsp.img,6be03a523b4a75f993c9cf3f14537feaf6f2e57e)
+$(call add-radio-file-sha1-checked,radio/fsg.img,00ba7613d85008a1dcf0fe0b506419e333a570f8)
+$(call add-radio-file-sha1-checked,radio/hyp.img,23fb6c4bc130c9affe877333f936e55881946dc1)
+$(call add-radio-file-sha1-checked,radio/keymaster.img,e1b70e9e9d2160835dab79f9422868965abc549e)
+$(call add-radio-file-sha1-checked,radio/logo.img,b3ee2745ee6a75b62a19caa63cdb5043710df5ac)
+$(call add-radio-file-sha1-checked,radio/modem.img,791814149b1535ed6c1b076f7aa2647e05810624)
+$(call add-radio-file-sha1-checked,radio/prov.img,1aad021746e1cc8dfaf88c214bf553916f06847a)
+$(call add-radio-file-sha1-checked,radio/qupfw.img,e9fa7d22eb00ccde0a2310364fe8619192e9a7bf)
+$(call add-radio-file-sha1-checked,radio/rpm.img,f3bc9671236188790c64c00841f803d5377f5cef)
+$(call add-radio-file-sha1-checked,radio/storsec.img,8f3317a958849f1832780c94fa8a7d583b841930)
+$(call add-radio-file-sha1-checked,radio/tz.img,dbe9bece36f3507bceee76c7ac47bee2bcc04058)
+$(call add-radio-file-sha1-checked,radio/uefisecapp.img,f7c539921467125d27f7a4a3d72b0dfe3fad88f9)
+$(call add-radio-file-sha1-checked,radio/xbl.img,679277e00977428981a755a40005bc9e83dd5fbd)
+$(call add-radio-file-sha1-checked,radio/xbl_config.img,5d233ff90d3e5da2c9417512e34dcd448862a88c)
+
+endif

BoardConfigVendor.mk

@@ -1,3 +1,22 @@
 #
 # Automatically generated file. DO NOT MODIFY
 #
+
+AB_OTA_PARTITIONS += \
+    abl \
+    bluetooth \
+    devcfg \
+    dsp \
+    fsg \
+    hyp \
+    keymaster \
+    logo \
+    modem \
+    prov \
+    qupfw \
+    rpm \
+    storsec \
+    tz \
+    uefisecapp \
+    xbl \
+    xbl_config

fogos-vendor.mk

@@ -25,6 +25,9 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20201gid1_3d_ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20201gid1_3d_ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20202.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20202.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20205.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20205.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20205spn_3d_cu.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20205spn_3d_cu.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20205spn_3d_cu_2d_x.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20205spn_3d_cu_2d_x.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20205spn_3d_vodafone_20_gr.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20205spn_3d_vodafone_20_gr.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20209.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20209.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20210.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20210.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20402.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20402.pb \
@@ -51,11 +54,11 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20416gid1_3d_8f.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20416gid1_3d_8f.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20416gid1_3d_ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20416gid1_3d_ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20416spn_3d_ben_20_nl.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20416spn_3d_ben_20_nl.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20416spn_3d_odido.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20416spn_3d_odido.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20416spn_3d_simpel.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20416spn_3d_simpel.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20416spn_3d_simpel_20_nl.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20416spn_3d_simpel_20_nl.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20416spn_3d_t_2d_mobile_20_nl.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20416spn_3d_t_2d_mobile_20_nl.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20416spn_3d_tele2_20_nl.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20416spn_3d_tele2_20_nl.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20417.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20417.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20417spn_3d_lebara.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20417spn_3d_lebara.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20433.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20433.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20465gid1_3d_50.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20465gid1_3d_50.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20601.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20601.pb \
@@ -73,7 +76,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20610gid1_3d_bb00.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20610gid1_3d_bb00.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20610spn_3d_be_2d_transatel.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20610spn_3d_be_2d_transatel.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20612.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20612.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20614.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20614.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20620.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20620.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20620gid1_3d_28.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20620gid1_3d_28.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20628.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20628.pb \
@@ -94,6 +96,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s208090gid1_3d_11ffffffffffffff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s208090gid1_3d_11ffffffffffffff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_11ffffffffffffff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_11ffffffffffffff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6332.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6332.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6336.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6336.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6530.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6530.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6532.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6532.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6538.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6538.pb \
@@ -101,6 +104,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6636.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6636.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6638.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6638.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6732.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6732.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6736.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6736.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6738.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6738.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6830.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6830.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20809gid1_3d_6836.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20809gid1_3d_6836.pb \
@@ -144,12 +148,10 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20827.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20827.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20827spn_3d_coriolis.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20827spn_3d_coriolis.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20828.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20828.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20829.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20829.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20835.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20835.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20838.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20838.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20838spn_3d_lebara.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20838spn_3d_lebara.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20888.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20888.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s20891.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s20891.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21401.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21401.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21402.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21402.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21403.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21403.pb \
@@ -226,8 +228,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21432spn_3d_tuenti.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21432spn_3d_tuenti.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21434.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21434.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21438.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21438.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s214701.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s214701.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s214703.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s214703.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21601.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21601.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21630.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21630.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s21630spn_3d_t_2d_mobile_20_h.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s21630spn_3d_t_2d_mobile_20_h.pb \
@@ -364,7 +364,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23203gid1_3d_74.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23203gid1_3d_74.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23203gid1_3d_75.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23203gid1_3d_75.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23203gid1_3d_c5.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23203gid1_3d_c5.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23204.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23204.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23205.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23205.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23207.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23207.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23207gid1_3d_07.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23207gid1_3d_07.pb \
@@ -389,12 +388,9 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23217gid1_3d_0044.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23217gid1_3d_0044.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23217gid1_3d_0x0042.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23217gid1_3d_0x0042.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23217gid1_3d_0x0044.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23217gid1_3d_0x0044.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23217gid1_3d_42.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23217gid1_3d_42.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23217gid1_3d_44.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23217gid1_3d_44.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23228.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23228.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23401.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23401.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23403.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23403.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23405.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23405.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23408gid1_3d_b2.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23408gid1_3d_b2.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23408gid1_3d_b2ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23408gid1_3d_b2ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23410.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23410.pb \
@@ -414,11 +410,12 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23410spn_3d_giffgaff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23410spn_3d_giffgaff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23410spn_3d_jump.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23410spn_3d_jump.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415gid1_3d_90.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415gid1_3d_90.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415gid1_3d_a1.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415gid1_3d_a1.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415gid1_3d_b3.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415gid1_3d_b3.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415gid1_3d_c1.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415gid1_3d_c1.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415spn_3d_asda_20_mobile.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415spn_3d_asda_20_mobile.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415spn_3d_lebara.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415spn_3d_lebara.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415spn_3d_sainsbury_27_s.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415spn_3d_sainsbury_27_s.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415spn_3d_talkmobile.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415spn_3d_talkmobile.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415spn_3d_talktalk.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415spn_3d_talktalk.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23415spn_3d_vodafone_20_uk.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23415spn_3d_vodafone_20_uk.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s23420.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s23420.pb \
@@ -488,8 +485,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24004.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24004.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24005spn_3d_telia.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24005spn_3d_telia.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24006.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24006.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24006gid1_3d_0e.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24006gid1_3d_0e.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24006spn_3d_telavox.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24006spn_3d_telavox.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_0040.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_0040.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_0041.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_0041.pb \
@@ -506,12 +501,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_0x0048.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_0x0048.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_0x0050.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_0x0050.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_0x0052.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_0x0052.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_40.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_40.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_41.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_41.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_42.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_42.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_44.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_44.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_48.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_48.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007gid1_3d_52.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007gid1_3d_52.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007imsi_3d_24007561.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007imsi_3d_24007561.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007imsi_3d_240075610.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007imsi_3d_240075610.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24007imsi_3d_240075614.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24007imsi_3d_240075614.pb \
@@ -520,8 +509,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24008.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24008.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24009.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24009.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24010.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24010.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24012.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24012.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24012spn_3d_lycamobile.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24012spn_3d_lycamobile.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24024.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24024.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24024spn_3d_tele2.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24024spn_3d_tele2.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24042gid1_3d_c5.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24042gid1_3d_c5.pb \
@@ -547,7 +534,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24412.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24412.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24413.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24413.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24421.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24421.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24436.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24436.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24491.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24491.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24492.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24492.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24601.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24601.pb \
@@ -558,7 +544,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s246083.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s246083.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s246084.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s246084.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24681.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24681.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s246816.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s246816.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24701.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24701.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24702.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24702.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24705.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24705.pb \
@@ -569,7 +554,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24801spn_3d_diil.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24801spn_3d_diil.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24801spn_3d_telia.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24801spn_3d_telia.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24802.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24802.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24803.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24803.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24803imsi_3d_24803000x.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24803imsi_3d_24803000x.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s24803imsi_3d_24803005x.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s24803imsi_3d_24803005x.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s25001.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s25001.pb \
@@ -747,39 +731,25 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26214.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26214.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26221.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26221.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26223.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26223.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26223imsi_3d_20801156.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26223imsi_3d_20801156.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26223imsi_3d_20801157.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26223imsi_3d_20801157.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26242.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26242.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26277.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26277.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s262800.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s262800.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26298.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26298.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26801.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26801.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26801spn_3d_zon.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26801spn_3d_zon.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26802.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26802.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26803.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26803.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26803spn_3d_get.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26803spn_3d_get.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26803spn_3d_nos.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26803spn_3d_nos.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26803spn_3d_woo.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26803spn_3d_woo.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26803spn_3d_wtf.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26803spn_3d_wtf.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26804.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26804.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26806.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26806.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26808.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26808.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26889.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26889.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26891.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26891.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26892.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26892.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26893spn_3d_get.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26893spn_3d_get.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26897.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26897.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26893spn_3d_nos.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26893spn_3d_nos.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26898.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26898.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26893spn_3d_woo.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26893spn_3d_woo.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26899.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26899.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26893spn_3d_wtf.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26893spn_3d_wtf.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26897spn_3d_get.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26897spn_3d_get.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26897spn_3d_nos.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26897spn_3d_nos.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26897spn_3d_woo.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26897spn_3d_woo.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26897spn_3d_wtf.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26897spn_3d_wtf.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26898spn_3d_get.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26898spn_3d_get.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26898spn_3d_nos.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26898spn_3d_nos.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26898spn_3d_woo.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26898spn_3d_woo.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26898spn_3d_wtf.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26898spn_3d_wtf.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26899spn_3d_get.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26899spn_3d_get.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26899spn_3d_nos.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26899spn_3d_nos.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26899spn_3d_woo.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26899spn_3d_woo.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s26899spn_3d_wtf.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26899spn_3d_wtf.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27001.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27001.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27002.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27002.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27077.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27077.pb \
@@ -795,7 +765,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27207.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27207.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27211.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27211.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27211imsi_3d_272110200677368.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27211imsi_3d_272110200677368.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27217.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27217.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27401.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27401.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27402.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27402.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s27403.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s27403.pb \
@@ -851,6 +820,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_5043.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_5043.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_5455.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_5455.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6332.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6332.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6336.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6336.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6530.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6530.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6532.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6532.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6538.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6538.pb \
@@ -858,6 +828,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6636.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6636.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6638.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6638.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6732.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6732.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6736.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6736.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6738.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6738.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6830.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6830.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302220gid1_3d_6836.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302220gid1_3d_6836.pb \
@@ -882,8 +853,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302370gid1_3d_4d.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302370gid1_3d_4d.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302370gid1_3d_dd.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302370gid1_3d_dd.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302370spn_3d_mts.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302370spn_3d_mts.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302480imsi_3d_3024800002.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302480imsi_3d_3024800002.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302480imsi_3d_302480017.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302480imsi_3d_302480017.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302490.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302490.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302490gid1_3d_53.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302490gid1_3d_53.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302500.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302500.pb \
@@ -896,7 +865,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302610gid1_3d_3f.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302610gid1_3d_3f.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302610gid1_3d_40.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302610gid1_3d_40.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302610gid1_3d_42.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302610gid1_3d_42.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s30262.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s30262.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302620.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302620.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302630.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302630.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302630gid1_3d_3e.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302630gid1_3d_3e.pb \
@@ -919,7 +887,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302660spn_3d_mts.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302660spn_3d_mts.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s30268.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s30268.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302680.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302680.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302681.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302681.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302690.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302690.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302690gid1_3d_41.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302690gid1_3d_41.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302690gid1_3d_43.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302690gid1_3d_43.pb \
@@ -937,7 +904,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302720spn_3d_cityfone.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302720spn_3d_cityfone.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302721.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302721.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302780.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302780.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302781.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302781.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s302860.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s302860.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s30286gid1_3d_4b4f.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s30286gid1_3d_4b4f.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s30286gid1_3d_5455.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s30286gid1_3d_5455.pb \
@@ -1263,7 +1229,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310130spn_3d_sprint.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310130spn_3d_sprint.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310140.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310140.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310150.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310150.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310150gid1_3d_52ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310150gid1_3d_52ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310160.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310160.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310160gid1_3d_1a53.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310160gid1_3d_1a53.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310160gid1_3d_2ac9.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310160gid1_3d_2ac9.pb \
@@ -1312,6 +1277,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6303.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6303.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6430.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6430.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6432.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6432.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6434.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6434.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6436.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6436.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6438.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6438.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6440.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6440.pb \
@@ -1325,7 +1291,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6910.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6910.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6911.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6911.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6912.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6912.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6918.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6918.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6941.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6941.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6957.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6957.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310240gid1_3d_6c79.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310240gid1_3d_6c79.pb \
@@ -1476,11 +1441,13 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_30.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_30.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3430.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3430.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3432.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3432.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3434.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3434.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3436.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3436.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3438.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3438.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3440.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3440.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3442.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3442.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3444.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3444.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3446.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3446.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3448.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3448.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3450.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3450.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310410gid1_3d_3452.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310410gid1_3d_3452.pb \
@@ -1522,8 +1489,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310590gid1_3d_ba01450000000000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310590gid1_3d_ba01450000000000.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310590gid1_3d_ba01620000000000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310590gid1_3d_ba01620000000000.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310590gid1_3d_ba01640000000000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310590gid1_3d_ba01640000000000.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310590gid1_3d_bae1000000000000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310590gid1_3d_bae1000000000000.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310590gid1_3d_bae2000000000000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310590gid1_3d_bae2000000000000.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310591.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310591.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310591gid1_3d_ba01270000000000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310591gid1_3d_ba01270000000000.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310591gid1_3d_ba01640000000000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310591gid1_3d_ba01640000000000.pb \
@@ -1599,7 +1564,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310950gid1_3d_53ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310950gid1_3d_53ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310950gid1_3d_62ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310950gid1_3d_62ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310950gid1_3d_69ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310950gid1_3d_69ff.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310950gid1_3d_80ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310950gid1_3d_80ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310950gid1_3d_ddff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310950gid1_3d_ddff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310950gid1_3d_deff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310950gid1_3d_deff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s310960.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s310960.pb \
@@ -1645,14 +1609,10 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_30.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_30.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3430.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3430.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3432.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3432.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3434.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3434.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3436.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3436.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3438.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3438.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3440.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3440.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3442.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3442.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3444.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3444.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3448.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3448.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3450.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3450.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_3452.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_3452.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_4102.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_4102.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_4201.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_4201.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_44ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_44ff.pb \
@@ -1660,7 +1620,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_53ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_53ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_62ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_62ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_69ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_69ff.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_80ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_80ff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_ddff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_ddff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311180gid1_3d_deff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311180gid1_3d_deff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s311190.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s311190.pb \
@@ -2037,6 +1996,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313140.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313140.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313220.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313220.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6332.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6332.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6336.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6336.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6530.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6530.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6532.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6532.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6538.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6538.pb \
@@ -2045,6 +2005,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6638.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6638.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6730.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6730.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6732.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6732.pb \
+    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6736.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6736.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6738.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6738.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6830.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6830.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s313340gid1_3d_6836.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s313340gid1_3d_6836.pb \
@@ -2068,7 +2029,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s314200.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s314200.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s314240.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s314240.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s315010.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s315010.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s315010gid1_3d_6907.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s315010gid1_3d_6907.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s316010.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s316010.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s330000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s330000.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s33011.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s33011.pb \
@@ -2133,7 +2093,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s334140spn_3d_wimo.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s334140spn_3d_wimo.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s334140spn_3d_yo.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s334140spn_3d_yo.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s334160.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s334160.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s334160spn_3d_izzi.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s334160spn_3d_izzi.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s33430.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s33430.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s338050.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s338050.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s338070.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s338070.pb \
@@ -2143,7 +2102,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s34004gid1_3d_f008.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s34004gid1_3d_f008.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s34009gid1_3d_f007.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s34009gid1_3d_f007.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s34020.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s34020.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s34020imsi_3d_3402002.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s34020imsi_3d_3402002.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s34260.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s34260.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s342600.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s342600.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s34492.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s34492.pb \
@@ -2165,11 +2123,8 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s36011.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s36011.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s360110.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s360110.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s36269.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s36269.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s36301.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s36301.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s36302.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s36302.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s363020.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s363020.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s364039.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s364039.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s36439.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s36439.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s36449.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s36449.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s36584.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s36584.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s365840.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s365840.pb \
@@ -2247,7 +2202,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40436.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40436.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40437.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40437.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40438.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40438.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40439.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40439.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40440.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40440.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40441.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40441.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40442.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40442.pb \
@@ -2273,7 +2227,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40460spn_3d_vodafone_20_in.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40460spn_3d_vodafone_20_in.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40462.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40462.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40464.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40464.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40465.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40465.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40466.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40466.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40467.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40467.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s40468.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s40468.pb \
@@ -2619,7 +2572,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s44020.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s44020.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s44020gid1_3d_01ffff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s44020gid1_3d_01ffff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s44020gid1_3d_16ffff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s44020gid1_3d_16ffff.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s44020gid1_3d_48ffff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s44020gid1_3d_48ffff.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s44050.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s44050.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s44050gid1_3d_10.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s44050gid1_3d_10.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s44050gid1_3d_20.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s44050gid1_3d_20.pb \
@@ -2801,11 +2753,9 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s51403.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s51403.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s51502.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s51502.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s51503.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s51503.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s51503imsi_3d_5150363.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s51503imsi_3d_5150363.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s51505.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s51505.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s51518.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s51518.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s51566.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s51566.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s51566spn_3d_dito.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s51566spn_3d_dito.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s52000.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s52000.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s52000gid1_3d_01.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s52000gid1_3d_01.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s52000gid1_3d_01ff.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s52000gid1_3d_01ff.pb \
@@ -2870,7 +2820,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s60201.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s60201.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s60202.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s60202.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s60203.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s60203.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s60204.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s60204.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s60301.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s60301.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s60302.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s60302.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s60303.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s60303.pb \
@@ -3029,11 +2978,9 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s64901.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s64901.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s64902.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s64902.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s64903.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s64903.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s64904.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s64904.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s65001.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s65001.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s65010.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s65010.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s65101.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s65101.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s65102.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s65102.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s65202.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s65202.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s65310.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s65310.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s65401.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s65401.pb \
@@ -3121,7 +3068,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s72439.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s72439.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s72454.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s72454.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s72477.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s72477.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s72489.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s72489.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s73001.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s73001.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s73002.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s73002.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s73003.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s73003.pb \
@@ -3131,7 +3077,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s73008.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s73008.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s73009.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s73009.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s73010.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s73010.pb \
-    vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s73023.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s73023.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s73026.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s73026.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s732001.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s732001.pb \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s732101.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s732101.pb \
@@ -3185,17 +3130,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/product/etc/CarrierSettings/s999480.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s999480.pb
 
 PRODUCT_COPY_FILES += \
-    vendor/motorola/fogos/proprietary/product/etc/permissions/com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.camera3.xml \
-    vendor/motorola/fogos/proprietary/product/etc/permissions/com.motorola.moto-uirefresh.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.motorola.moto-uirefresh.xml \
-    vendor/motorola/fogos/proprietary/product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml \
     vendor/motorola/fogos/proprietary/product/etc/permissions/privapp-permissions-com.google.android.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-com.google.android.euicc.xml \
-    vendor/motorola/fogos/proprietary/product/etc/permissions/privapp-permissions-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-com.motorola.camera3.xml \
-    vendor/motorola/fogos/proprietary/product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml \
-    vendor/motorola/fogos/proprietary/recovery/root/vendor/firmware/ILITEK_FW:$(TARGET_COPY_OUT_RECOVERY)/root/vendor/firmware/ILITEK_FW \
-    vendor/motorola/fogos/proprietary/recovery/root/vendor/firmware/chipone_firmware.bin:$(TARGET_COPY_OUT_RECOVERY)/root/vendor/firmware/chipone_firmware.bin \
-    vendor/motorola/fogos/proprietary/system/etc/permissions/com.motorola.motosignature.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.motorola.motosignature.xml \
-    vendor/motorola/fogos/proprietary/system/etc/permissions/moto-core_services.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-core_services.xml \
-    vendor/motorola/fogos/proprietary/system/etc/permissions/moto-settings.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-settings.xml \
     vendor/motorola/fogos/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/motorola/fogos/proprietary/vendor/etc/SVIConfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/SVIConfig.xml \
     vendor/motorola/fogos/proprietary/vendor/etc/acdbdata/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Bluetooth_cal.acdb \
@@ -3227,20 +3162,19 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/vendor/etc/camera/vidhance_calibration_2rd:$(TARGET_COPY_OUT_VENDOR)/etc/camera/vidhance_calibration_2rd \
     vendor/motorola/fogos/proprietary/vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-goodixservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.biometrics.fingerprint@2.1-goodixservice.rc \
     vendor/motorola/fogos/proprietary/vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc \
+    vendor/motorola/fogos/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.sec.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.nfc@1.2-service.sec.rc \
     vendor/motorola/fogos/proprietary/vendor/etc/init/init.gf_ident.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.gf_ident.rc \
+    vendor/motorola/fogos/proprietary/vendor/etc/init/init.nfc.sec.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.nfc.sec.rc \
     vendor/motorola/fogos/proprietary/vendor/etc/init/motorola.hardware.camera.desktop@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/motorola.hardware.camera.desktop@2.0-service.rc \
     vendor/motorola/fogos/proprietary/vendor/etc/libnfc-sec-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-nci.conf \
     vendor/motorola/fogos/proprietary/vendor/etc/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf \
-    vendor/motorola/fogos/proprietary/vendor/etc/permissions/com.motorola.camera3.content.ai.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.content.ai.xml \
-    vendor/motorola/fogos/proprietary/vendor/etc/permissions/com.motorola.camera3.fogos.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.fogos.xml \
-    vendor/motorola/fogos/proprietary/vendor/etc/permissions/com.motorola.camera3.lens.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.lens.xml \
-    vendor/motorola/fogos/proprietary/vendor/etc/permissions/com.motorola.camera3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.xml \
     vendor/motorola/fogos/proprietary/vendor/etc/qdcm_calib_data_mipi_mot_vid_tm_icnl9916c_hdp_652_120.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_mipi_mot_vid_tm_icnl9916c_hdp_652_120.xml \
     vendor/motorola/fogos/proprietary/vendor/etc/qdcm_calib_data_mipi_mot_vid_txd_ili9883c_hdp_652_120.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_mipi_mot_vid_txd_ili9883c_hdp_652_120.xml \
     vendor/motorola/fogos/proprietary/vendor/etc/sec_s3nrn4v_hwreg.bin:$(TARGET_COPY_OUT_VENDOR)/etc/sec_s3nrn4v_hwreg.bin \
     vendor/motorola/fogos/proprietary/vendor/etc/sec_s3nrn4v_swreg.bin:$(TARGET_COPY_OUT_VENDOR)/etc/sec_s3nrn4v_swreg.bin \
     vendor/motorola/fogos/proprietary/vendor/etc/sensors/config/icm4x6xa.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/icm4x6xa.json \
     vendor/motorola/fogos/proprietary/vendor/etc/sensors/config/mot_camgest.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/mot_camgest.json \
+    vendor/motorola/fogos/proprietary/vendor/etc/sensors/config/mot_tap.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/mot_tap.json \
     vendor/motorola/fogos/proprietary/vendor/etc/sensors/config/sns_amd.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/sns_amd.json \
     vendor/motorola/fogos/proprietary/vendor/etc/sensors/config/sns_amd_sw_disabled.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/sns_amd_sw_disabled.json \
     vendor/motorola/fogos/proprietary/vendor/etc/sensors/config/sns_amd_sw_enabled.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/sns_amd_sw_enabled.json \
@@ -3277,17 +3211,19 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/fogos/proprietary/vendor/firmware/ILITEK_FW:$(TARGET_COPY_OUT_VENDOR)/firmware/ILITEK_FW \
     vendor/motorola/fogos/proprietary/vendor/firmware/aw963xx_reg_0.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/aw963xx_reg_0.bin \
     vendor/motorola/fogos/proprietary/vendor/firmware/chipone_firmware.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/chipone_firmware.bin \
+    vendor/motorola/fogos/proprietary/vendor/firmware/csot_focal_test_limits.ini:$(TARGET_COPY_OUT_VENDOR)/firmware/csot_focal_test_limits.ini \
+    vendor/motorola/fogos/proprietary/vendor/firmware/focaltech_ts_fw_csot.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/focaltech_ts_fw_csot.bin \
     vendor/motorola/fogos/proprietary/vendor/firmware/fs1815.fsm:$(TARGET_COPY_OUT_VENDOR)/firmware/fs1815.fsm \
+    vendor/motorola/fogos/proprietary/vendor/firmware/goodix-tm-gt9916S-23051702-646483c4-fogos.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/goodix-tm-gt9916S-23051702-646483c4-fogos.bin \
     vendor/motorola/fogos/proprietary/vendor/firmware/sec_s3nrn4v_firmware.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/sec_s3nrn4v_firmware.bin \
+    vendor/motorola/fogos/proprietary/vendor/firmware/tm_goodix_cfg_group.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/tm_goodix_cfg_group.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.sensormodule.mot_fogor_s5kjns_qtech.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.mot_fogor_s5kjns_qtech.bin \
-    vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.sensormodule.mot_fogor_s5kjns_qtech_2nd.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.mot_fogor_s5kjns_qtech_2nd.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.sensormodule.mot_fogor_sc202acs_sunny.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.mot_fogor_sc202acs_sunny.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.sensormodule.mot_fogos_ov16a1q_ofilm.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.mot_fogos_ov16a1q_ofilm.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.sensormodule.mot_fogos_s5k3p9_qtech.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.sensormodule.mot_fogos_s5k3p9_qtech.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.tuned.default.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.default.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.tuned.mot_fogo_sc202acs.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.mot_fogo_sc202acs.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.tuned.mot_fogor_s5kjns.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.mot_fogor_s5kjns.bin \
-    vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.tuned.mot_fogor_s5kjns_2nd.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.mot_fogor_s5kjns_2nd.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.tuned.mot_fogos_ov16a1q.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.mot_fogos_ov16a1q.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/com.qti.tuned.mot_fogos_s5k3p9.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.tuned.mot_fogos_s5k3p9.bin \
     vendor/motorola/fogos/proprietary/vendor/lib64/camera/fdconfigpreview.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigpreview.bin \
@@ -3449,12 +3385,16 @@ PRODUCT_PACKAGES += \
     libofflinelog \
     libopencv \
     libopestriping \
+    libos \
     libportrait_repair_ppl3_ocl \
+    libpowercore \
     libqll10 \
     libqllengine \
     libremosaic_wrapper \
     libswregistrationalgo \
+    libsynx \
     libtfestriping \
+    libthreadutils \
     libvidhance \
     motorola.hardware.camera.desktop@1.0 \
     motorola.hardware.camera.desktop@2.0 \
@@ -3463,22 +3403,14 @@ PRODUCT_PACKAGES += \
     vendor.goodix.hardware.biometrics.fingerprint@3.0 \
     vendor.qti.hardware.camera.postproc@1.0-service-impl \
     vendor.qti.hardware.fingerprint@1.0 \
-    MotoSignatureApp \
     EuiccPartnerApp \
-    MotCamera3AI \
     EuiccGoogle \
     HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND \
     HotwordEnrollmentXGoogleHEXAGON_WIDEBAND \
-    MotCamera4 \
-    MotorolaSettingsProvider \
-    com.motorola.motosignature \
-    moto-core_services \
-    moto-settings \
     com.android.hotwordenrollment.common.util \
     capsense_reset \
     android.hardware.biometrics.fingerprint@2.1-goodixservice \
     android.hardware.biometrics.fingerprint@2.1-service-fpc \
     fpc_ident \
     goodix_ident \
-    motorola.hardware.camera.desktop@2.0-service \
+    motorola.hardware.camera.desktop@2.0-service
-    motsettings

proprietary/product/etc/CarrierSettings/carrier_list.pb

@@ -41,6 +41,15 @@ $
 
 s20202
 20202
+
+s20205spn_3d_cu
+20205cu
+%
+s20205spn_3d_cu_2d_x
+20205cu-x
+3
+s20205spn_3d_vodafone_20_gr
+20205vodafone gr
 
 s20205
 20205
@@ -123,21 +132,21 @@ $s204043spn_3d_avantel_20_roaming_20_
 s20416gid1_3d_ff
 20416"ff
 )
-s20416spn_3d_ben_20_nl
-20416ben nl
-$
 s20416spn_3d_ben_20_nl
 20416ben nl
 &
 s20416spn_3d_simpel
 20416simpel
 /
+s20416spn_3d_simpel_20_nl
+20416	simpel nl
+6
+s20416spn_3d_t_2d_mobile_20_nl
+20416t-mobile nl
+-
 s20416spn_3d_tele2_20_nl
 20416tele2 nl
 
-s20416
-20416
-&
 s20416
 20416
 
@@ -192,9 +201,6 @@ $
 s20610
 20610
 
-s20612
-20612
-
 s20612
 20612
 
@@ -247,6 +253,9 @@ $
 20809"11ffffffffffffff
 #
 s20809gid1_3d_6332
+20809"6332
+#
+s20809gid1_3d_6336
 20809"6336
 #
 s20809gid1_3d_6530
@@ -268,6 +277,9 @@ $
 20809"6638
 #
 s20809gid1_3d_6732
+20809"6732
+#
+s20809gid1_3d_6736
 20809"6736
 #
 s20809gid1_3d_6738
@@ -406,9 +418,6 @@ $
 s20827
 20827
 
-s20828
-20828
-
 s20828
 20828
 
@@ -421,9 +430,6 @@ $
 s20838
 20838
 
-s20888
-20888
-
 s20888
 20888
 
@@ -653,12 +659,6 @@ $
 
 s21434
 21434
-
-s21438
-21438
-
-s214701
-214701
 
 s21438
 21438
@@ -1078,9 +1078,6 @@ telekom sk
 s23203gid1_3d_c5
 23203"c5
 
-s23203
-23203
-
 s23203
 23203
 
@@ -1145,16 +1142,10 @@ telekom sk
 23217"0042
 #
 s23217gid1_3d_0044
-23217"0044
+23217"0044
 '
 s23217gid1_3d_0x0042
-23217"0X0042
+23217"0x0042
-'
-s23217gid1_3d_0x0044
-23217"0X0044
-
-s23217gid1_3d_42
-23217"42
 '
 s23217gid1_3d_0x0044
 23217"0x0044
@@ -1167,9 +1158,6 @@ telekom sk
 
 s23401
 23401
-
-s23403
-23403
 
 s23403
 23403
@@ -1225,24 +1213,28 @@ k
 s23410spn_3d_jump
 23410jump
 
-s23410
-23410
-
 s23410
 23410
 
-s23415gid1_3d_b3
-23415"B3
-
 s23415gid1_3d_b3
 23415"B3
-
+
-s23415gid1_3d_c1
+s23415gid1_3d_c1
-23415"c1
+23415"c1
+.
 s23415spn_3d_talkmobile
 23415
 TALKMOBILE
 *
+s23415spn_3d_talktalk
+23415TALKTALK
+3
+s23415spn_3d_asda_20_mobile
+23415asda mobile
+&
+s23415spn_3d_lebara
+23415lebara
+3
 s23415spn_3d_sainsbury_27_s
 23415sainsbury's
 3
@@ -1434,7 +1426,7 @@ lycamobile
 23877
 
 s23910
-23910
+23910
 (
 s24001spn_3d_halebop
 24001HALEBOP
@@ -1447,12 +1439,6 @@ lycamobile
 
 s24004
 24004
-$
-s24005spn_3d_telia
-24005telia
-
-s24006gid1_3d_0e
-24006"0e
 $
 s24005spn_3d_telia
 24005telia
@@ -1477,48 +1463,30 @@ $
 #
 s24007gid1_3d_0050
 24007"0050
-#
-s24007gid1_3d_0052
-24007"0052
-'
-s24007gid1_3d_0x0040
-24007"0X0040
-'
-s24007gid1_3d_0x0041
-24007"0X0041
-'
-s24007gid1_3d_0x0042
-24007"0X0042
-'
-s24007gid1_3d_0x0044
-24007"0X0044
-'
-s24007gid1_3d_0x0048
-24007"0X0048
 #
 s24007gid1_3d_0052
 24007"0052
 
+s24007gid1_3d_0c
+24007"0c
+'
+s24007gid1_3d_0x0040
+24007"0x0040
+'
+s24007gid1_3d_0x0041
+24007"0x0041
+'
+s24007gid1_3d_0x0042
+24007"0x0042
+'
+s24007gid1_3d_0x0044
+24007"0x0044
+'
 s24007gid1_3d_0x0048
 24007"0x0048
-'
+'
-s24007gid1_3d_0x0050
+s24007gid1_3d_0x0050
-24007"0x0050
+24007"0x0050
-
-s24007gid1_3d_40
-24007"40
-
-s24007gid1_3d_41
-24007"41
-
-s24007gid1_3d_42
-24007"42
-
-s24007gid1_3d_44
-24007"44
-
-s24007gid1_3d_48
-24007"48
 '
 s24007gid1_3d_0x0052
 24007"0x0052
@@ -1546,13 +1514,6 @@ $
 
 s24009
 24009
-
-s24010
-24010
-.
-s24012spn_3d_lycamobile
-24012
-lycamobile
 
 s24010
 24010
@@ -1629,9 +1590,6 @@ $
 s24413
 24413
 
-s24421
-24421
-
 s24421
 24421
 
@@ -1661,9 +1619,6 @@ $
 
 s246084
 246084
-
-s24681
-24681
 
 s24681
 24681
@@ -1701,9 +1656,6 @@ $
 s24803imsi_3d_24803000x
 24803	24803000X
 -
-s24803imsi_3d_24803005x
-24803	24803005X
-
 s24803imsi_3d_24803005x
 24803	24803005X
 
@@ -2242,6 +2194,12 @@ $
 s26212
 26212
 
+s26214
+26214
+
+s26221
+26221
++
 s26223imsi_3d_20801156
 2622320801156
 +
@@ -2251,6 +2209,9 @@ $
 s26223
 26223
 
+s26242
+26242
+
 s26277
 26277
 
@@ -2263,18 +2224,6 @@ $
 s26801spn_3d_zon
 26801ZON
 
-s26801
-26801
-
-s26802
-26802
- 
-s26803spn_3d_get
-26803get
- 
-s26803spn_3d_nos
-26803nos
- 
 s26801
 26801
 
@@ -2296,54 +2245,15 @@ $
 s26889
 26889
 
-s26891
+s26891
-26891
+26891
-
+
-s26892
+s26892
-26892
+26892
- 
+
-s26893spn_3d_get
+s26897
-26893get
+26897
- 
+
-s26893spn_3d_nos
-26893nos
- 
-s26893spn_3d_woo
-26893woo
- 
-s26893spn_3d_wtf
-26893wtf
- 
-s26897spn_3d_get
-26897get
- 
-s26897spn_3d_nos
-26897nos
- 
-s26897spn_3d_woo
-26897woo
- 
-s26897spn_3d_wtf
-26897wtf
- 
-s26898spn_3d_get
-26898get
- 
-s26898spn_3d_nos
-26898nos
- 
-s26898spn_3d_woo
-26898woo
- 
-s26898spn_3d_wtf
-26898wtf
- 
-s26899spn_3d_get
-26899get
- 
-s26899spn_3d_nos
-26899nos
- 
 s26898
 26898
 
@@ -2390,9 +2300,6 @@ $
 27207
 9
 s27211imsi_3d_272110200677368
-27211272110200677368
-
-s27211
 27211272110200677368
 
 s27211
@@ -2567,6 +2474,9 @@ telekom.me
 302220"5043
 %
 s302220gid1_3d_5455
+302220"5455
+%
+s302220gid1_3d_6332
 302220"6332
 %
 s302220gid1_3d_6336
@@ -2588,6 +2498,9 @@ telekom.me
 302220"6636
 %
 s302220gid1_3d_6638
+302220"6638
+%
+s302220gid1_3d_6732
 302220"6732
 %
 s302220gid1_3d_6736
@@ -2653,13 +2566,6 @@ telekom.me
 s302370gid1_3d_4d
 302370"4d
 !
-s302370gid1_3d_dd
-302370"dd
-"
-s302370spn_3d_mts
-302370MTS
-1
-s302480imsi_3d_3024800002
 s302370gid1_3d_dd
 302370"dd
 "
@@ -2696,9 +2602,6 @@ telekom.me
 s302610gid1_3d_40
 302610"40
 !
-s302610gid1_3d_42
-302610"42
-
 s302610gid1_3d_42
 302610"42
 
@@ -2765,9 +2668,6 @@ telekom.me
 s302660spn_3d_mts
 302660mts
 
-s30268
-30268
-
 s30268
 30268
 
@@ -2819,9 +2719,6 @@ telekom.me
 s302720
 302720
 
-s302721
-302721
-
 s302721
 302721
 
@@ -3796,9 +3693,6 @@ $
 s310130spn_3d_sprint
 310130sprint
 
-s310130
-310130
-
 s310130
 310130
 
@@ -3944,6 +3838,9 @@ $
 310240"6303
 %
 s310240gid1_3d_6430
+310240"6430
+%
+s310240gid1_3d_6432
 310240"6432
 %
 s310240gid1_3d_6434
@@ -3983,9 +3880,6 @@ $
 310240"6910
 %
 s310240gid1_3d_6911
-310240"6911
-%
-s310240gid1_3d_6912
 310240"6911
 %
 s310240gid1_3d_6912
@@ -4436,6 +4330,9 @@ $
 310410"30
 %
 s310410gid1_3d_3430
+310410"3430
+%
+s310410gid1_3d_3432
 310410"3432
 %
 s310410gid1_3d_3434
@@ -4451,6 +4348,9 @@ $
 310410"3440
 %
 s310410gid1_3d_3442
+310410"3442
+%
+s310410gid1_3d_3444
 310410"3444
 %
 s310410gid1_3d_3446
@@ -4573,12 +4473,6 @@ $
 s310590gid1_3d_ba01450000000000
 310590"ba01450000000000
 =
-s310590gid1_3d_ba01620000000000
-310590"ba01620000000000
-=
-s310590gid1_3d_ba01640000000000
-310590"ba01640000000000
-=
 s310590gid1_3d_ba01620000000000
 310590"ba01620000000000
 =
@@ -4805,9 +4699,6 @@ $
 310950"53ff
 %
 s310950gid1_3d_62ff
-310950"62ff
-%
-s310950gid1_3d_69ff
 310950"62ff
 %
 s310950gid1_3d_69ff
@@ -4945,6 +4836,9 @@ SNAKERIVER
 s311180gid1_3d_30
 311180"30
 %
+s311180gid1_3d_3430
+311180"3430
+%
 s311180gid1_3d_3432
 311180"3432
 %
@@ -4954,21 +4848,6 @@ SNAKERIVER
 s311180gid1_3d_3436
 311180"3436
 %
-s311180gid1_3d_3438
-311180"3438
-%
-s311180gid1_3d_3440
-311180"3440
-%
-s311180gid1_3d_3442
-311180"3442
-%
-s311180gid1_3d_3444
-311180"3444
-%
-s311180gid1_3d_3448
-311180"3448
-%
 s311180gid1_3d_3438
 311180"3438
 %
@@ -4990,9 +4869,6 @@ SNAKERIVER
 s311180gid1_3d_53ff
 311180"53ff
 %
-s311180gid1_3d_62ff
-311180"62ff
-%
 s311180gid1_3d_62ff
 311180"62ff
 %
@@ -6129,6 +6005,9 @@ Ks312530gid1_3d_a00184ffffffffffffffffffffffffffffffffffffffffffffffffffffffF
 313130
 
 s313140
+313140
+
+s313220
 313220
 %
 s313340gid1_3d_6332
@@ -6153,6 +6032,9 @@ Ks312530gid1_3d_a00184ffffffffffffffffffffffffffffffffffffffffffffffffffffffF
 313340"6636
 %
 s313340gid1_3d_6638
+313340"6638
+%
+s313340gid1_3d_6730
 313340"6730
 %
 s313340gid1_3d_6732
@@ -6218,9 +6100,6 @@ Ks312530gid1_3d_a00184ffffffffffffffffffffffffffffffffffffffffffffffffffffffF
 s314020
 314020
 
-s314090
-314090
-
 s314090
 314090
 
@@ -6414,9 +6293,6 @@ $
 &
 s334140spn_3d_valor
 334140valor
-$
-s334140spn_3d_wimo
-334140wimo
 $
 s334140spn_3d_wimo
 334140wimo
@@ -6444,9 +6320,6 @@ $
 
 s338180
 338180
-
-s34001
-34001
 
 s34001
 34001
@@ -6514,20 +6387,11 @@ $
 s358110
 358110
 
-s36011
-36011
-
 s36011
 36011
 
 s360110
 360110
-
-s36301
-36301
-
-s36302
-36302
 
 s36269
 36269
@@ -6760,9 +6624,6 @@ $
 s40435
 40435
 
-s40436
-40436
-
 s40436
 40436
 
@@ -6838,9 +6699,6 @@ $
 s40460spn_3d_vodafone_20_in
 40460vodafone in
 
-s40460
-40460
-
 s40460
 40460
 
@@ -7872,9 +7730,6 @@ $
 
 s44011
 44011
-
-s44013
-44013
 
 s44013
 44013
@@ -8420,9 +8275,6 @@ K
 
 s51401
 51401
-
-s51402
-51402
 
 s51402
 51402
@@ -8432,9 +8284,6 @@ K
 
 s51502
 51502
-
-s51503
-51503
 
 s51503
 51503
@@ -8631,9 +8480,6 @@ K
 s55280
 55280
 
-s60201
-60201
-
 s60201
 60201
 
@@ -9108,9 +8954,6 @@ K
 s64804
 64804
 
-s64901
-64901
-
 s64901
 64901
 
@@ -9120,9 +8963,6 @@ K
 s64903
 64903
 
-s65001
-65001
-
 s65001
 65001
 
@@ -9385,9 +9225,6 @@ K
 s72438
 72438
 
-s72439
-72439
-
 s72439
 72439
 
@@ -9415,9 +9252,6 @@ K
 s73007
 73007
 
-s73008
-73008
-
 s73008
 73008
 
@@ -9464,7 +9298,7 @@ K
 732111UNE
 1
 s732111spn_3d_etb_20_movil
-732111	etb movil
+732111	etb movil
 
 s732111
 732111
@@ -9569,4 +9403,4 @@ K
 s90128
 90128
 
-s90137
+s90137

proprietary/product/etc/CarrierSettings/s20403imsi_3d_20403.pb

@@ -1,14 +1,9 @@
 
-s20403imsi_3d_20403è´¢§
1/
+s20403imsi_3d_20403ج»¢
1/
-MVNO NLinternet.mvno.mobi
BmvnoJmvnoP
"š 
+MVNO NLinternet.mvno.mobi
BmvnoJmvnoP
"ü
*
-allow_merging_rtt_calls_bool(
*
 &always_show_emergency_alert_onoff_bool(
-
 )carrier_force_disable_etws_cmas_test_bool(

-display_hd_plus_icon_bool(
 
+display_hd_plus_icon_bool(
#
-ignore_rtt_mode_setting_bool(
#
 moto_data_stall_check_count_int22
 moto_data_stall_config_stringrsrp=-108,sinr=-1'
-#moto_support_data_stall_detect_bool(
 
+#moto_support_data_stall_detect_bool(

-rtt_downgrade_supported_bool(

-rtt_supported_bool(

-rtt_upgrade_supported_bool(

proprietary/product/etc/CarrierSettings/s204043spn_3d_avantel_20_roaming_20_.pb

@@ -1,14 +1,9 @@
 
-$s204043spn_3d_avantel_20_roaming_20_è´¢§
!
+$s204043spn_3d_avantel_20_roaming_20_ج»¢
!
-Avantellte.avantel.com.co
"š 
+Avantellte.avantel.com.co
"ü
*
-allow_merging_rtt_calls_bool(
*
 &always_show_emergency_alert_onoff_bool(
-
 )carrier_force_disable_etws_cmas_test_bool(

-display_hd_plus_icon_bool(
 
+display_hd_plus_icon_bool(
#
-ignore_rtt_mode_setting_bool(
#
 moto_data_stall_check_count_int22
 moto_data_stall_config_stringrsrp=-108,sinr=-1'
-#moto_support_data_stall_detect_bool(
 
+#moto_support_data_stall_detect_bool(

-rtt_downgrade_supported_bool(

-rtt_supported_bool(

-rtt_upgrade_supported_bool(

proprietary/product/etc/CarrierSettings/s20465gid1_3d_50.pb

@@ -1,14 +1,9 @@
 
-s20465gid1_3d_50è´¢§

+s20465gid1_3d_50ج»¢

-AGMS NLagms.nl.gmm
"š 
+AGMS NLagms.nl.gmm
"ü
*
-allow_merging_rtt_calls_bool(
*
 &always_show_emergency_alert_onoff_bool(
-
 )carrier_force_disable_etws_cmas_test_bool(

-display_hd_plus_icon_bool(
 
+display_hd_plus_icon_bool(
#
-ignore_rtt_mode_setting_bool(
#
 moto_data_stall_check_count_int22
 moto_data_stall_config_stringrsrp=-108,sinr=-1'
-#moto_support_data_stall_detect_bool(
 
+#moto_support_data_stall_detect_bool(

-rtt_downgrade_supported_bool(

-rtt_supported_bool(

-rtt_upgrade_supported_bool(

proprietary/product/etc/CarrierSettings/s208090.pb

@@ -1,16 +1,11 @@
 
-s208090è´¢§
"´ 
+s208090ج»¢
"–$
-allow_merging_rtt_calls_bool(
$
+ hide_preferred_network_type_bool(

- hide_preferred_network_type_bool(
 
-ignore_rtt_mode_setting_bool(

 maxImageHeight˜
 
 maxImageWidth 
 maxSubjectLengthP#
 moto_data_stall_check_count_int22
 moto_data_stall_config_stringrsrp=-108,sinr=-1'
-#moto_support_data_stall_detect_bool(

+#moto_support_data_stall_detect_bool(

-recipientLimit 
-rtt_downgrade_supported_bool(

-rtt_supported_bool(

 recipientLimit