fogos: Update to V1UG35H.75-14-3

Change-Id: I38e21993e1a8f70f2efa1fee05b93a5a1780ca51

Android.mk

@@ -6,22 +6,22 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),fogos)
 
-$(call add-radio-file-sha1-checked,radio/abl.img,392e392019f5dfa346aa4a094b8420fcc1a49401)
+$(call add-radio-file-sha1-checked,radio/abl.img,0dc668aa97664d3ea8f85d340d7902b6ce4f28d1)
-$(call add-radio-file-sha1-checked,radio/bluetooth.img,6f93e91771713989a5f1f48d6af8b75ee2615eeb)
+$(call add-radio-file-sha1-checked,radio/bluetooth.img,e7ffe1a9d0a9ebca1cf54100bc73f807743af7e2)
-$(call add-radio-file-sha1-checked,radio/devcfg.img,11ed72197b91218902e3ccba01d866a334d54cb8)
+$(call add-radio-file-sha1-checked,radio/devcfg.img,1a0ca851806b846142dead9fd220cd559c50b382)
 $(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/fsg.img,706518a10b8dfa075abe5c3186e2d400bcb98d77)
-$(call add-radio-file-sha1-checked,radio/hyp.img,9f24b8b4412bb37af22f77caf81194dfed99c034)
+$(call add-radio-file-sha1-checked,radio/hyp.img,acb41a48620da03f0dcf6ce8877b8823b3c9a322)
-$(call add-radio-file-sha1-checked,radio/keymaster.img,e7e59c2b348a9fb1db4688c763dbd9b04422bc12)
+$(call add-radio-file-sha1-checked,radio/keymaster.img,2807405d7de338c0818d0afd20129f1185432af8)
-$(call add-radio-file-sha1-checked,radio/logo.img,ee8e33d157084f17b26ee978be99ef3eb3796767)
+$(call add-radio-file-sha1-checked,radio/logo.img,f727bfa0502d5a30d3577d1d51091cd474331978)
-$(call add-radio-file-sha1-checked,radio/modem.img,88147195e01e511c29a0903b13809d5e3bd4ae83)
+$(call add-radio-file-sha1-checked,radio/modem.img,52bc9881f5a579743c9cf1254c4c3f5d4e636cb5)
-$(call add-radio-file-sha1-checked,radio/prov.img,48c68bf944f2b326c08fa8b1e05c8d5e81b79d79)
+$(call add-radio-file-sha1-checked,radio/prov.img,0ee9cb8cf63f3b23b16636342aaeb29f61516845)
-$(call add-radio-file-sha1-checked,radio/qupfw.img,8516c9e20be0e22526da4f1cbab58e940c521a15)
+$(call add-radio-file-sha1-checked,radio/qupfw.img,7b052055a6c6b11a870908c9d375689257e070c1)
-$(call add-radio-file-sha1-checked,radio/rpm.img,7fe1be1a49f60a262fa9ab1643ce81dfc949ed3d)
+$(call add-radio-file-sha1-checked,radio/rpm.img,ebaed8692d787dd147861a47e82f64018dfea9db)
-$(call add-radio-file-sha1-checked,radio/storsec.img,f8a2c910ae98a8809b0254209a719ee4e10510b4)
+$(call add-radio-file-sha1-checked,radio/storsec.img,ee056715f48e6339e895a1f90bf7dd3d604ffa56)
-$(call add-radio-file-sha1-checked,radio/tz.img,8b3b9b0d9dad9a8e2e795ab5f2fc5686d55c7643)
+$(call add-radio-file-sha1-checked,radio/tz.img,4d8cd5de668a021f9ef9a42eca1d9ea390b26fbd)
-$(call add-radio-file-sha1-checked,radio/uefisecapp.img,6da277e5fd95d82f96d8ad22b700ac2bf91cb6dd)
+$(call add-radio-file-sha1-checked,radio/uefisecapp.img,5b1bc4e23dae8d300c86c0fab7e21c3ca58af0a8)
-$(call add-radio-file-sha1-checked,radio/xbl.img,ab72c8360944c4465912838442d2a92f0774b836)
+$(call add-radio-file-sha1-checked,radio/xbl.img,b739edc44ce1fbf75ce3348855ce9485acf9b010)
-$(call add-radio-file-sha1-checked,radio/xbl_config.img,c3a19d4dc26b13310a70eae3339b829e361e6461)
+$(call add-radio-file-sha1-checked,radio/xbl_config.img,69ca106d4bdbeceeaa8f59e0bac487cc52c0802c)
 
 endif

fogos-vendor.mk

@@ -25,9 +25,6 @@ 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 \
@@ -54,11 +51,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 \
@@ -76,6 +73,7 @@ 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 \
@@ -96,7 +94,6 @@ 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 \
@@ -104,7 +101,6 @@ 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 \
@@ -148,10 +144,12 @@ 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 \
@@ -228,6 +226,8 @@ 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,6 +364,7 @@ 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 \
@@ -388,9 +389,12 @@ 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 \
@@ -410,12 +414,11 @@ 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 \
@@ -485,6 +488,8 @@ 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 \
@@ -501,6 +506,12 @@ 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 \
@@ -509,6 +520,8 @@ 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 \
@@ -534,6 +547,7 @@ 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 \
@@ -544,6 +558,7 @@ 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 \
@@ -554,6 +569,7 @@ 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 \
@@ -731,25 +747,39 @@ 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/s26897.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26897.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/s26898.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26898.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/s26899.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/s26899.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/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 \
@@ -765,6 +795,7 @@ 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 \
@@ -820,7 +851,6 @@ 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 \
@@ -828,7 +858,6 @@ 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 \
@@ -853,6 +882,8 @@ 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 \
@@ -865,6 +896,7 @@ 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 \
@@ -887,6 +919,7 @@ 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 \
@@ -904,6 +937,7 @@ 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 \
@@ -1229,6 +1263,7 @@ 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 \
@@ -1277,7 +1312,6 @@ 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 \
@@ -1291,6 +1325,7 @@ 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 \
@@ -1441,13 +1476,11 @@ 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 \
@@ -1489,6 +1522,8 @@ 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 \
@@ -1564,6 +1599,7 @@ 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 \
@@ -1609,10 +1645,14 @@ 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 \
@@ -1620,6 +1660,7 @@ 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 \
@@ -1996,7 +2037,6 @@ 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 \
@@ -2005,7 +2045,6 @@ 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 \
@@ -2029,6 +2068,7 @@ 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 \
@@ -2093,6 +2133,7 @@ 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 \
@@ -2102,6 +2143,7 @@ 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 \
@@ -2123,8 +2165,11 @@ 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 \
@@ -2202,6 +2247,7 @@ 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 \
@@ -2227,6 +2273,7 @@ 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 \
@@ -2572,6 +2619,7 @@ 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 \
@@ -2753,9 +2801,11 @@ 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 \
@@ -2820,6 +2870,7 @@ 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 \
@@ -2978,9 +3029,11 @@ 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 \
@@ -3068,6 +3121,7 @@ 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 \
@@ -3077,6 +3131,7 @@ 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 \

proprietary/product/etc/CarrierSettings/carrier_list.pb

@@ -41,15 +41,6 @@ $
 
 s20202
 20202
-
-s20205spn_3d_cu
-20205cu
-%
-s20205spn_3d_cu_2d_x
-20205cu-x
-3
-s20205spn_3d_vodafone_20_gr
-20205vodafone gr
 
 s20205
 20205
@@ -132,21 +123,21 @@ $s204043spn_3d_avantel_20_roaming_20_
 s20416gid1_3d_ff
 20416"ff
 )
+s20416spn_3d_ben_20_nl
+20416ben nl
+$
 s20416spn_3d_odido
 20416odido
 &
 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_simpel_20_nl
 20416	simpel nl
 
+s20416
+20416
+&
 s20417spn_3d_lebara
 20417lebara
 
@@ -201,6 +192,9 @@ $s204043spn_3d_avantel_20_roaming_20_
 s20610
 20610
 
+s20612
+20612
+
 s20614
 20614
 
@@ -253,9 +247,6 @@ $s204043spn_3d_avantel_20_roaming_20_
 20809"11ffffffffffffff
 #
 s20809gid1_3d_6332
-20809"6332
-#
-s20809gid1_3d_6336
 20809"6332
 #
 s20809gid1_3d_6530
@@ -277,9 +268,6 @@ $s204043spn_3d_avantel_20_roaming_20_
 20809"6638
 #
 s20809gid1_3d_6732
-20809"6732
-#
-s20809gid1_3d_6736
 20809"6732
 #
 s20809gid1_3d_6738
@@ -418,6 +406,9 @@ $s204043spn_3d_avantel_20_roaming_20_
 s20827
 20827
 
+s20828
+20828
+
 s20829
 20829
 
@@ -430,6 +421,9 @@ $s204043spn_3d_avantel_20_roaming_20_
 s20838
 20838
 
+s20888
+20888
+
 s20891
 20891
 
@@ -659,6 +653,12 @@ $
 
 s21434
 21434
+
+s21438
+21438
+
+s214701
+214701
 
 s214703
 214703
@@ -1078,6 +1078,9 @@ telekom sk
 s23203gid1_3d_c5
 23203"c5
 
+s23203
+23203
+
 s23204
 23204
 
@@ -1142,10 +1145,16 @@ 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_44
 23217"44
@@ -1158,6 +1167,9 @@ telekom sk
 
 s23401
 23401
+
+s23403
+23403
 
 s23405
 23405
@@ -1213,28 +1225,24 @@ k
 s23410spn_3d_jump
 23410jump
 
+s23410
+23410
+
 s23415gid1_3d_90
 23415"90
 
+s23415gid1_3d_b3
+23415"B3
+
 s23415gid1_3d_a1
 23415"a1
-
+
-s23415gid1_3d_c1
+s23415gid1_3d_c1
-23415"c1
+23415"c1
-.
 3
 s23415spn_3d_sainsbury_27_s
 23415SAINSBURY'S
 *
-s23415spn_3d_talktalk
-23415TALKTALK
-3
-s23415spn_3d_asda_20_mobile
-23415asda mobile
-&
-s23415spn_3d_lebara
-23415lebara
-3
 s23415spn_3d_talktalk
 23415TALKTALK
 3
@@ -1426,7 +1434,7 @@ lycamobile
 23877
 
 s23910
-23910
+23910
 (
 s24001spn_3d_halebop
 24001halebop
@@ -1439,6 +1447,12 @@ lycamobile
 
 s24004
 24004
+$
+s24005spn_3d_telia
+24005telia
+
+s24006gid1_3d_0e
+24006"0e
 (
 s24006spn_3d_telavox
 24006telavox
@@ -1463,30 +1477,48 @@ $
 #
 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_0x0052
 24007"0X0052
 
-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_0c
 24007"0c
-'
+'
-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_52
 24007"52
@@ -1514,6 +1546,13 @@ $
 
 s24009
 24009
+
+s24010
+24010
+.
+s24012spn_3d_lycamobile
+24012
+lycamobile
 
 s24012
 24012
@@ -1590,6 +1629,9 @@ $
 s24413
 24413
 
+s24421
+24421
+
 s24436
 24436
 
@@ -1619,6 +1661,9 @@ $
 
 s246084
 246084
+
+s24681
+24681
 
 s246816
 246816
@@ -1656,6 +1701,9 @@ $
 s24803imsi_3d_24803000x
 24803	24803000X
 -
+s24803imsi_3d_24803005x
+24803	24803005X
+
 s24803
 24803
 
@@ -2194,12 +2242,6 @@ $
 s26212
 26212
 
-s26214
-26214
-
-s26221
-26221
-+
 s26214
 26214
 
@@ -2209,9 +2251,6 @@ $
 s26223
 26223
 
-s26242
-26242
-
 s26242
 26242
 
@@ -2224,6 +2263,18 @@ $
 s26801spn_3d_zon
 26801ZON
 
+s26801
+26801
+
+s26802
+26802
+ 
+s26803spn_3d_get
+26803get
+ 
+s26803spn_3d_nos
+26803nos
+ 
 s26803spn_3d_woo
 26803woo
  
@@ -2245,15 +2296,54 @@ $
 s26889
 26889
 
-s26891
+s26891
-26891
+26891
-
+
-s26892
+s26892
-26892
+26892
-
+ 
-s26897
+s26893spn_3d_get
-26897
+26893get
-
+ 
+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
+ 
 s26899spn_3d_woo
 26899woo
  
@@ -2300,6 +2390,9 @@ $
 27207
 9
 s27211imsi_3d_272110200677368
+27211272110200677368
+
+s27211
 27211
 
 s27217
@@ -2474,9 +2567,6 @@ telekom.me
 302220"5043
 %
 s302220gid1_3d_5455
-302220"5455
-%
-s302220gid1_3d_6332
 302220"5455
 %
 s302220gid1_3d_6332
@@ -2498,9 +2588,6 @@ telekom.me
 302220"6636
 %
 s302220gid1_3d_6638
-302220"6638
-%
-s302220gid1_3d_6732
 302220"6638
 %
 s302220gid1_3d_6732
@@ -2566,6 +2653,13 @@ telekom.me
 s302370gid1_3d_4d
 302370"4d
 !
+s302370gid1_3d_dd
+302370"dd
+"
+s302370spn_3d_mts
+302370MTS
+1
+s302480imsi_3d_3024800002
 302480
 3024800002
 /
@@ -2602,6 +2696,9 @@ telekom.me
 s302610gid1_3d_40
 302610"40
 !
+s302610gid1_3d_42
+302610"42
+
 s302610
 302610
 
@@ -2668,6 +2765,9 @@ telekom.me
 s302660spn_3d_mts
 302660mts
 
+s30268
+30268
+
 s302680
 302680
 
@@ -2719,6 +2819,9 @@ telekom.me
 s302720
 302720
 
+s302721
+302721
+
 s302780
 302780
 
@@ -3693,6 +3796,9 @@ $
 s310130spn_3d_sprint
 310130sprint
 
+s310130
+310130
+
 s310140
 310140
 %
@@ -3838,9 +3944,6 @@ $
 310240"6303
 %
 s310240gid1_3d_6430
-310240"6430
-%
-s310240gid1_3d_6432
 310240"6430
 %
 s310240gid1_3d_6432
@@ -3880,6 +3983,9 @@ $
 310240"6910
 %
 s310240gid1_3d_6911
+310240"6911
+%
+s310240gid1_3d_6912
 310240"6912
 %
 s310240gid1_3d_6918
@@ -4330,9 +4436,6 @@ $
 310410"30
 %
 s310410gid1_3d_3430
-310410"3430
-%
-s310410gid1_3d_3432
 310410"3430
 %
 s310410gid1_3d_3432
@@ -4348,9 +4451,6 @@ $
 310410"3440
 %
 s310410gid1_3d_3442
-310410"3442
-%
-s310410gid1_3d_3444
 310410"3442
 %
 s310410gid1_3d_3444
@@ -4473,6 +4573,12 @@ $
 s310590gid1_3d_ba01450000000000
 310590"ba01450000000000
 =
+s310590gid1_3d_ba01620000000000
+310590"ba01620000000000
+=
+s310590gid1_3d_ba01640000000000
+310590"ba01640000000000
+=
 s310590gid1_3d_bae1000000000000
 310590"bae1000000000000
 =
@@ -4699,6 +4805,9 @@ $
 310950"53ff
 %
 s310950gid1_3d_62ff
+310950"62ff
+%
+s310950gid1_3d_69ff
 310950"69FF
 %
 s310950gid1_3d_80ff
@@ -4836,9 +4945,6 @@ SNAKERIVER
 s311180gid1_3d_30
 311180"30
 %
-s311180gid1_3d_3430
-311180"3430
-%
 s311180gid1_3d_3430
 311180"3430
 %
@@ -4848,6 +4954,21 @@ 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_3450
 311180"3450
 %
@@ -4869,6 +4990,9 @@ SNAKERIVER
 s311180gid1_3d_53ff
 311180"53ff
 %
+s311180gid1_3d_62ff
+311180"62ff
+%
 s311180gid1_3d_69ff
 311180"69FF
 %
@@ -6005,9 +6129,6 @@ Ks312530gid1_3d_a00184ffffffffffffffffffffffffffffffffffffffffffffffffffffffF
 313130
 
 s313140
-313140
-
-s313220
 313140
 
 s313220
@@ -6032,9 +6153,6 @@ Ks312530gid1_3d_a00184ffffffffffffffffffffffffffffffffffffffffffffffffffffffF
 313340"6636
 %
 s313340gid1_3d_6638
-313340"6638
-%
-s313340gid1_3d_6730
 313340"6638
 %
 s313340gid1_3d_6730
@@ -6100,6 +6218,9 @@ Ks312530gid1_3d_a00184ffffffffffffffffffffffffffffffffffffffffffffffffffffffF
 s314020
 314020
 
+s314090
+314090
+
 s314200
 314200
 
@@ -6293,6 +6414,9 @@ $
 &
 s334140spn_3d_valor
 334140valor
+$
+s334140spn_3d_wimo
+334140wimo
  
 s334140spn_3d_yo
 334140yo
@@ -6320,6 +6444,9 @@ $
 
 s338180
 338180
+
+s34001
+34001
 #
 s34004gid1_3d_f008
 34004"F008
@@ -6387,11 +6514,20 @@ $
 s358110
 358110
 
+s36011
+36011
+
 s360110
 360110
 
 s36269
 36269
+
+s36301
+36301
+
+s36302
+36302
 
 s363020
 363020
@@ -6624,6 +6760,9 @@ $
 s40435
 40435
 
+s40436
+40436
+
 s40437
 40437
 
@@ -6699,6 +6838,9 @@ $
 s40460spn_3d_vodafone_20_in
 40460vodafone in
 
+s40460
+40460
+
 s40462
 40462
 
@@ -7730,6 +7872,9 @@ $
 
 s44011
 44011
+
+s44013
+44013
 '
 s44020gid1_3d_01ffff
 44020"01ffff
@@ -8275,6 +8420,9 @@ K
 
 s51401
 51401
+
+s51402
+51402
 
 s51403
 51403
@@ -8284,6 +8432,9 @@ K
 )
 s51503imsi_3d_5150363
 515035150363
+
+s51503
+51503
 
 s51505
 51505
@@ -8480,6 +8631,9 @@ K
 s55280
 55280
 
+s60201
+60201
+
 s60202
 60202
 
@@ -8954,6 +9108,9 @@ K
 s64804
 64804
 
+s64901
+64901
+
 s64902
 64902
 
@@ -8963,6 +9120,9 @@ K
 s64904
 64904
 
+s65001
+65001
+
 s65010
 65010
 
@@ -9225,6 +9385,9 @@ K
 s72438
 72438
 
+s72439
+72439
+
 s72454
 72454
 
@@ -9252,6 +9415,9 @@ K
 s73007
 73007
 
+s73008
+73008
+
 s73009
 73009
 
@@ -9298,7 +9464,7 @@ K
 732111UNE
 1
 s732111spn_3d_etb_20_movil
-732111	etb movil
+732111	etb movil
 
 s732111
 732111
@@ -9403,4 +9569,4 @@ K
 s90128
 90128
 
-s90137
+s90137

proprietary/product/etc/CarrierSettings/s20403imsi_3d_20403.pb

@@ -1,9 +1,14 @@
 
-s20403imsi_3d_20403ج<EFBFBD><EFBFBD>
1/
+s20403imsi_3d_20403<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
1/
-MVNO NLinternet.mvno.mobi
BmvnoJmvnoP
"<22>
*
+MVNO NLinternet.mvno.mobi
BmvnoJmvnoP
"<22> 
+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,9 +1,14 @@
 
-$s204043spn_3d_avantel_20_roaming_20_ج<EFBFBD><EFBFBD>
!
+$s204043spn_3d_avantel_20_roaming_20_<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
!
-Avantellte.avantel.com.co
"<22>
*
+Avantellte.avantel.com.co
"<22> 
+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,9 +1,14 @@
 
-s20465gid1_3d_50ج<EFBFBD><EFBFBD>

+s20465gid1_3d_50<EFBFBD><EFBFBD><EFBFBD><EFBFBD>

-AGMS NLagms.nl.gmm
"<22>
*
+AGMS NLagms.nl.gmm
"<22> 
+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,11 +1,16 @@
 
-s208090ج<EFBFBD><EFBFBD>
"<22>$
+s208090<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
"<22> 
- hide_preferred_network_type_bool(

+allow_merging_rtt_calls_bool(
$
+ hide_preferred_network_type_bool(
 
+ignore_rtt_mode_setting_bool(

 maxImageHeight<18>
 
 maxImageWidth<18>
 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(

 rtt_upgrade_supported_bool(