overlay-operators: Drop deprecated preferred network type values

This has been moved from to the settings app a long time ago. Get rid of
the useless overlays here. We need to modify the settings app directly
anyway, to introduce custom options and logic.

See commit platform/packages/services/Telephony@04ead6a37b.

Issue: FP3-A13#44
Change-Id: I2df651326c4eb3e2d9eda0c7f678cf93e92bb1c2
diff --git a/overlay-operators/packages/services/Telephony/res/values-af/strings.xml b/overlay-operators/packages/services/Telephony/res/values-af/strings.xml
deleted file mode 100644
index 08de8a4..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-af/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Net TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globaal"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Net EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sonder EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo outomaties"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA outomaties"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Net WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Net GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA verkies"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-am/strings.xml b/overlay-operators/packages/services/Telephony/res/values-am/strings.xml
deleted file mode 100644
index 218794c..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-am/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA ብቻ"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"አለምአቀፍ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo ብቻ"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA  ያለ EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo በራስሰር"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM / WCDMA ራስሰር"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA ብቻ"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM ብቻ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM / WCDMA ተመራጭ"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ar/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ar/strings.xml
deleted file mode 100644
index c9ce70c..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ar/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA فقط"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"عام"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo فقط"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo تلقائي"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM / WCDMA تلقائي"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA فقط"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"‏نظام GSM فقط"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"‏GSM/WCDMA المفضل"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-az-rAZ/strings.xml b/overlay-operators/packages/services/Telephony/res/values-az-rAZ/strings.xml
deleted file mode 100644
index cd8365d..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-az-rAZ/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Yalnız TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Qlobal"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Yalnız EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo avto"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA avtomatik"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Yalnız WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Yalnız GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA\'ya üstünlük verilib"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-bg/strings.xml b/overlay-operators/packages/services/Telephony/res/values-bg/strings.xml
deleted file mode 100644
index 0ff2e8b..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-bg/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Само TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Глобален"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Само EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA без EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Авт. CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Авт. GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Само WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Само GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Предпочита се GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-bn-rBD/strings.xml b/overlay-operators/packages/services/Telephony/res/values-bn-rBD/strings.xml
deleted file mode 100644
index dca4ca4..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">শুধুমাত্র TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"গ্লোবাল"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"শুধুমাত্র EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo স্বয়ংক্রিয়"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA স্বয়ংক্রিয়"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"শুধুমাত্র WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"শুধুমাত্র GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA সুবিধাজনক"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ca/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ca/strings.xml
deleted file mode 100644
index 9d0c8c2..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ca/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Només TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Només EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sense EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automàtic"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automàtic"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Només WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Només GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA preferit"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-cs/strings.xml b/overlay-operators/packages/services/Telephony/res/values-cs/strings.xml
deleted file mode 100644
index 59d297c..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-cs/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Pouze TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globální"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Pouze EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA bez EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo – automaticky"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA – automaticky"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Pouze WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Pouze GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA – preferováno"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-da/strings.xml b/overlay-operators/packages/services/Telephony/res/values-da/strings.xml
deleted file mode 100644
index 71156c9..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-da/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Kun TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA+LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Kun EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA uden EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Automatisk CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Automatisk GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Kun WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Kun GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA foretrækkes"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-de/strings.xml b/overlay-operators/packages/services/Telephony/res/values-de/strings.xml
deleted file mode 100644
index 356eb0f..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-de/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Nur TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Nur EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA ohne EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo (automatisch)"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA (automatisch)"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Nur WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Nur GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA bevorzugt"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-el/strings.xml b/overlay-operators/packages/services/Telephony/res/values-el/strings.xml
deleted file mode 100644
index 124c03e..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-el/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Μόνο TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Παγκόσμια"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Μόνο EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA χωρίς EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Αυτόματη επιλογή EvDo/CDMA"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Αυτόματη επιλογή GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Μόνο WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Μόνο GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Προτιμώνται GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-en-rGB/strings.xml b/overlay-operators/packages/services/Telephony/res/values-en-rGB/strings.xml
deleted file mode 100644
index f45162a..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-en-rIN/strings.xml b/overlay-operators/packages/services/Telephony/res/values-en-rIN/strings.xml
deleted file mode 100644
index f45162a..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-es-rUS/strings.xml b/overlay-operators/packages/services/Telephony/res/values-es-rUS/strings.xml
deleted file mode 100644
index af1d354..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA solamente"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo solamente"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sin EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automático"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automático"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA solamente"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM solamente"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA preferido"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-es/strings.xml b/overlay-operators/packages/services/Telephony/res/values-es/strings.xml
deleted file mode 100644
index 86fd79b..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-es/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Solo TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Solo EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sin EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Modo automático de CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA (modo automático)"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Solo WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Solo GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Preferencia de GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-et-rEE/strings.xml b/overlay-operators/packages/services/Telephony/res/values-et-rEE/strings.xml
deleted file mode 100644
index 38cb481..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-et-rEE/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Ainult TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globaalne"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Ainult EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA ilma EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Automaatne CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Automaatne GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Ainult WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Ainult GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Eelistatud GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-eu-rES/strings.xml b/overlay-operators/packages/services/Telephony/res/values-eu-rES/strings.xml
deleted file mode 100644
index 502deb7..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-eu-rES/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA soilik"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Orokorra"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM / WCDMA / LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo soilik"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"EvDo gabeko CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automatikoa"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automatikoa"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA soilik"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM soilik"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA hobetsita"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-fa/strings.xml b/overlay-operators/packages/services/Telephony/res/values-fa/strings.xml
deleted file mode 100644
index 9726416..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-fa/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"فقط TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"سراسری"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"فقط EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA بدون EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo خودکار"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA خودکار"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"فقط WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"فقط GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"‏GSM/WCDMA برگزیده"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-fi/strings.xml b/overlay-operators/packages/services/Telephony/res/values-fi/strings.xml
deleted file mode 100644
index d5277ca..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-fi/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Vain TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Maailmanlaajuinen"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Vain EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA ilman EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Automaattinen CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Automaattinen GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Vain WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Vain GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Ensisijaisesti GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-fr-rCA/strings.xml b/overlay-operators/packages/services/Telephony/res/values-fr-rCA/strings.xml
deleted file mode 100644
index 8203672..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA uniquement"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Général"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo uniquement"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sans EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automatique"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automatique"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA uniquement"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM uniquement"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA de préférence"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-fr/strings.xml b/overlay-operators/packages/services/Telephony/res/values-fr/strings.xml
deleted file mode 100644
index 8203672..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-fr/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA uniquement"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Général"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo uniquement"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sans EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automatique"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automatique"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA uniquement"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM uniquement"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA de préférence"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-gl-rES/strings.xml b/overlay-operators/packages/services/Telephony/res/values-gl-rES/strings.xml
deleted file mode 100644
index b0e3e0b..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-gl-rES/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Só TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Só EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sen EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automático"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automático"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Só WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Só GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA preferido"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-hi/strings.xml b/overlay-operators/packages/services/Telephony/res/values-hi/strings.xml
deleted file mode 100644
index 56d7d59..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-hi/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"केवल TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">LTE / WCDMA</string>
-    <string name="preferred_network_mode_lte_choice">LTE</string>
-    <string name="preferred_network_mode_global_choice">"वैश्विक"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">GSM/WCDMA/LTE</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">CDMA + LTE/EvDo</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">CDMA/EvDo/GSM/WCDMA</string>
-    <string name="preferred_network_mode_evdo_only_choice">"केवल EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"EvDo के बिना CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo स्वतः"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA स्वतः"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"केवल WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"केवल GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA पसंदीदा"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-hr/strings.xml b/overlay-operators/packages/services/Telephony/res/values-hr/strings.xml
deleted file mode 100644
index 95801f6..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-hr/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Samo TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globalno"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Samo EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA bez EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Automatski CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Automatski GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Samo WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Samo GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Preferirano GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-hu/strings.xml b/overlay-operators/packages/services/Telephony/res/values-hu/strings.xml
deleted file mode 100644
index 2d661c1..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-hu/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Csak TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globális"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Csak EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA EvDo nélkül"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automatikus"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automatikus"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Csak WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Csak GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA a preferált"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-hy-rAM/strings.xml b/overlay-operators/packages/services/Telephony/res/values-hy-rAM/strings.xml
deleted file mode 100644
index ab8d710..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-hy-rAM/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Միայն TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Միայն EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA առանց EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo ավտոմատ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA ավտոմատ"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Միայն WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Միայն GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA նախընտրելի"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-in/strings.xml b/overlay-operators/packages/services/Telephony/res/values-in/strings.xml
deleted file mode 100644
index b7b1b3d..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-in/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA saja"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo saja"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA tanpa EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo otomatis"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA otomatis"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA saja"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM saja"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA lebih disukai"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-is-rIS/strings.xml b/overlay-operators/packages/services/Telephony/res/values-is-rIS/strings.xml
deleted file mode 100644
index 061b1c1..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-is-rIS/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA eingöngu"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Alþjóðlegt"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo eingöngu"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA án EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo sjálfvirkt"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA sjálfvirkt"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA eingöngu"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM eingöngu"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA fyrsta val"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-it/strings.xml b/overlay-operators/packages/services/Telephony/res/values-it/strings.xml
deleted file mode 100644
index 3c67bba..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-it/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Solo TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globale"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Solo EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA senza EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automatico"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automatico"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Solo WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Solo GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA preferito"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-iw/strings.xml b/overlay-operators/packages/services/Telephony/res/values-iw/strings.xml
deleted file mode 100644
index 1b2f44d..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-iw/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA בלבד"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"גלובלי"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo בלבד"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA ללא EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"‏CDMA/EvDo אוטומטי"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"‏GSM/‏WCDMA אוטומטי"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA בלבד"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM בלבד"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"‏GSM/WCDMA מועדף"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ja/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ja/strings.xml
deleted file mode 100644
index 19fab2f..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ja/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMAのみ"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"グローバル"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA+LTE/EV-DO"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EV-DOのみ"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA(EV-DO非準拠)"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EV-DO自動"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA自動"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMAのみ"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSMのみ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMAを優先"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ka-rGE/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ka-rGE/strings.xml
deleted file mode 100644
index 2d28c0d..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ka-rGE/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">მხოლოდ TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"გლობალური"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"მხოლოდ EvDo</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA, EvDo-ის გარეშე"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo ავტო"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA ავტო"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"მხოლოდ WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"მხოლოდ GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA უპირატესობით"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-km-rKH/strings.xml b/overlay-operators/packages/services/Telephony/res/values-km-rKH/strings.xml
deleted file mode 100644
index c37284f..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-km-rKH/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">តែ TD-SCDMA ប៉ុណ្ណោះ"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"សកល"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"តែ EvDo ​ប៉ុណ្ណោះ"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo ស្វ័យប្រវត្តិ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA ស្វ័យប្រវត្តិ"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"តែ WCDMA ប៉ុណ្ណោះ"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"តែ GSM ប៉ុណ្ណោះ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA ដែល​ចូលចិត្ត​"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-kn-rIN/strings.xml b/overlay-operators/packages/services/Telephony/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 2d02c16..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA ಮಾತ್ರ"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"ಜಾಗತಿಕ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo ಮಾತ್ರ"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"EvDo ಇಲ್ಲದೆ CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo ಸ್ವಯಂ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA ಸ್ವಯಂ"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA ಮಾತ್ರ"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM ಮಾತ್ರ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ko/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ko/strings.xml
deleted file mode 100644
index ae55803..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ko/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA 전용"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"글로벌"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA+LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo 전용"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA(EvDo 없음)"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo 자동"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA 자동"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA 전용"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM 전용"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA로 기본 설정"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-lo-rLA/strings.xml b/overlay-operators/packages/services/Telephony/res/values-lo-rLA/strings.xml
deleted file mode 100644
index 5f595ab..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-lo-rLA/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA ເທົ່ານັ້ນ"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"ທົ່ວໂລກ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo ເທົ່ານັ້ນ"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo ອັດຕະໂນມັດ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA ອັດຕະໂນມັດ"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA ເທົ່ານັ້ນ"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM ເທົ່ານັ້ນ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"ຕ້ອງການ GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-lt/strings.xml b/overlay-operators/packages/services/Telephony/res/values-lt/strings.xml
deleted file mode 100644
index 7e22668..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-lt/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Tik TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Pasaulinis"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM / WCDMA / LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA ir LTE / „EvDo“"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA / „EvDo“ / GSM / WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Tik „EvDo“"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA be „EvDo“"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA / „EvDo“ automatinis"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM / WCDMA automatinis"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Tik WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Tik GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Pageidaujama GSM / WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-lv/strings.xml b/overlay-operators/packages/services/Telephony/res/values-lv/strings.xml
deleted file mode 100644
index 36477b2..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-lv/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">Tikai TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Vispārējs"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Tikai EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA bez EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automātiski"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automātiski"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Tikai WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Tikai GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Ieteicams GSM/WCDMA režīms"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ml-rIN/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ml-rIN/strings.xml
deleted file mode 100644
index eab1b71..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ml-rIN/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA മാത്രം"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"ഗ്ലോബൽ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo മാത്രം"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"EvDo ഇല്ലാത്ത CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo യാന്ത്രികം"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA യാന്ത്രികം"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA മാത്രം"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM മാത്രം"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA തിരഞ്ഞെടുത്തത്"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-mn-rMN/strings.xml b/overlay-operators/packages/services/Telephony/res/values-mn-rMN/strings.xml
deleted file mode 100644
index 8f973c6..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-mn-rMN/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Зөвхөн TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Глобаль"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Зөвхөн EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo авто"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA авто"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Зөвхөн WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Зөвхөн GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA эхэнд нь"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-mr-rIN/strings.xml b/overlay-operators/packages/services/Telephony/res/values-mr-rIN/strings.xml
deleted file mode 100644
index a14efa8..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-mr-rIN/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"केवळ TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"जागतिक"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"केवळ EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo स्‍वयं"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA स्‍वयं"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"केवळ WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"केवळ GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA प्राधान्‍यकृत"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ms-rMY/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ms-rMY/strings.xml
deleted file mode 100644
index 6e38854..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ms-rMY/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA sahaja"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo sahaja"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA tanpa EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo auto"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA auto"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA sahaja"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM sahaja"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA diutamakan"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-nb/strings.xml b/overlay-operators/packages/services/Telephony/res/values-nb/strings.xml
deleted file mode 100644
index 0da283c..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-nb/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Bare TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Overordnet"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Bare EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA uten EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automatisk"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM / WCDMA automatisk"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Bare WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Bare GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA foretrukket"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ne-rNP/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ne-rNP/strings.xml
deleted file mode 100644
index 58fa8dd..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ne-rNP/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA मात्र"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"विश्वव्यापी"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"केवल EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo अटो"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA स्वचालित"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA मात्र"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM मात्र"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA रुचाइएका"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-nl/strings.xml b/overlay-operators/packages/services/Telephony/res/values-nl/strings.xml
deleted file mode 100644
index 9363661..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-nl/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Alleen TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Wereldwijd"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Alleen EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA zonder EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automatisch"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automatisch"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Alleen WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Alleen GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Voorkeur voor GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-pl/strings.xml b/overlay-operators/packages/services/Telephony/res/values-pl/strings.xml
deleted file mode 100644
index e88aaca..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-pl/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Tylko TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globalny"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Tylko EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA bez EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Automatyczny CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Automatyczny GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Tylko WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Tylko GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Preferowany GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-pt-rPT/strings.xml b/overlay-operators/packages/services/Telephony/res/values-pt-rPT/strings.xml
deleted file mode 100644
index da576bd..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Apenas TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Apenas EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sem EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automático"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automático"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Apenas WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Apenas GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA preferido"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-pt/strings.xml b/overlay-operators/packages/services/Telephony/res/values-pt/strings.xml
deleted file mode 100644
index 3a75d27..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-pt/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Somente TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Somente EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA sem EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automático"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automático"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Somente WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Somente GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA preferencial"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ro/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ro/strings.xml
deleted file mode 100644
index ba89a18..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ro/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Numai TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Numai EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA fără EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo automat"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA automat"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Numai WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Numai GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA preferat"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ru/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ru/strings.xml
deleted file mode 100644
index e6ee76a..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ru/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Только TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Весь мир"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA и LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Только EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA без EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo (авторежим)"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA (авторежим)"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Только WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Только GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA (предпочтительно)"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-si-rLK/strings.xml b/overlay-operators/packages/services/Telephony/res/values-si-rLK/strings.xml
deleted file mode 100644
index efabc42..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-si-rLK/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA පමණි"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"ගෝලීය"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo පමණි"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA රහිත EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo ස්වයංක්‍රීය"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA ස්වයංක්‍රීය"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA පමණි"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM පමණි"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA කැමතියි"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-sk/strings.xml b/overlay-operators/packages/services/Telephony/res/values-sk/strings.xml
deleted file mode 100644
index 1654ba3..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-sk/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Iba TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globálny"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM / WCDMA / LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE / EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA / EvDo / GSM / WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Iba EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA bez EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA / EvDo – automaticky"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM / WCDMA – automaticky"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Iba WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Iba GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM / WCDMA – preferované"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-sl/strings.xml b/overlay-operators/packages/services/Telephony/res/values-sl/strings.xml
deleted file mode 100644
index 6e781c0..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-sl/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Samo TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globalno"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Samo EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA brez EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Samodejno CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Samodejno GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Samo WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Samo GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Prednostno GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-sr/strings.xml b/overlay-operators/packages/services/Telephony/res/values-sr/strings.xml
deleted file mode 100644
index 5a8933f..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-sr/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Само TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Глобално"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Само EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA без EvDo-а"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo аутоматски"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA аутоматски"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Само WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Само GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA има предност"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-sv/strings.xml b/overlay-operators/packages/services/Telephony/res/values-sv/strings.xml
deleted file mode 100644
index c7fd8d0..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-sv/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Endast TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Globalt"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Endast EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA utan EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo auto"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA auto"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Endast WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Endast GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Föredrar GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-sw/strings.xml b/overlay-operators/packages/services/Telephony/res/values-sw/strings.xml
deleted file mode 100644
index b7682eb..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-sw/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA pekee"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Ulimwenguni Kote"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo pekee"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo otomatiki"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA otomatiki"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA pekee"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM pekee"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA inapendelewa"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ta-rIN/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 6c25f56..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA மட்டும்"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Global"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo மட்டும்"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo தானியங்கு"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA தானியங்கு"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA மட்டும்"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM மட்டும்"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA பரிந்துரைக்கப்பட்டது"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-te-rIN/strings.xml b/overlay-operators/packages/services/Telephony/res/values-te-rIN/strings.xml
deleted file mode 100644
index 87cc12a..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-te-rIN/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA మాత్రమే"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"గ్లోబల్"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo మాత్రమే"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"EvDo లేని CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo స్వయంచాలకం"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA స్వయంచాలకం"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA మాత్రమే"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM మాత్రమే"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMAకు ప్రాధాన్యత"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-th/strings.xml b/overlay-operators/packages/services/Telephony/res/values-th/strings.xml
deleted file mode 100644
index 00a04b4..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-th/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA เท่านั้น"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"ทั่วโลก"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo เท่านั้น"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA ที่ไม่มี EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo อัตโนมัติ"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA อัตโนมัติ"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA เท่านั้น"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM เท่านั้น"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"ต้องการ GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-tl/strings.xml b/overlay-operators/packages/services/Telephony/res/values-tl/strings.xml
deleted file mode 100644
index 9253a9d..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-tl/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"TD-SCDMA lang"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Pangkalahatan"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"EvDo lang"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA na walang EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo auto"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA auto"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"WCDMA lang"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"GSM lang"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Ninanais ang GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-tr/strings.xml b/overlay-operators/packages/services/Telephony/res/values-tr/strings.xml
deleted file mode 100644
index a897480..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-tr/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Yalnızca TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Dünya Genelinde"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Yalnızca EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"EvDo olmadan CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo otomatik"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA otomatik"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Yalnızca WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Yalnızca GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA tercih edilen"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-uk/strings.xml b/overlay-operators/packages/services/Telephony/res/values-uk/strings.xml
deleted file mode 100644
index f1dbcc3..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-uk/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Лише TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Загальний"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Лише EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA без EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"Авто CDMA/EvDo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Авто GSM/WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Лише WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Лише GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Рекомендовано GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-ur-rPK/strings.xml b/overlay-operators/packages/services/Telephony/res/values-ur-rPK/strings.xml
deleted file mode 100644
index 9afd3b3..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-ur-rPK/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"صرف TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"عالمی"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"صرف EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"‏CDMA بغیر EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"‏CDMA/EvDo آٹو"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"‏GSM/WCDMA آٹو"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"صرف WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"صرف GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"‏GSM/WCDMA ترجیحی"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-vi/strings.xml b/overlay-operators/packages/services/Telephony/res/values-vi/strings.xml
deleted file mode 100644
index 40ba63b..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-vi/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"Chỉ TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Toàn cầu"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"Chỉ EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA không có EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo tự động"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA tự động"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"Chỉ WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"Chỉ GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA được ưa thích"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-zh-rCN/strings.xml b/overlay-operators/packages/services/Telephony/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 616a3db..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"仅 TD-SCDMA"</string>
-    <string name="preferred_network_mode_global_choice">"通用"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"仅 EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA,无 EvDo 功能"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo 自动选择"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA 自动选择"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"仅 WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"仅 GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"首选 GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-zh-rHK/strings.xml b/overlay-operators/packages/services/Telephony/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 88d200a..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"只限 TD-SCDMA"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"LTE"</string>
-    <string name="preferred_network_mode_global_choice">"全球"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"只限 EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA (無 EvDo)"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo 自動切換"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA 自動切換"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"只限 WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"只限 GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"首選 GSM/WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-zh-rTW/strings.xml b/overlay-operators/packages/services/Telephony/res/values-zh-rTW/strings.xml
deleted file mode 100644
index ed6eddc..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_global_choice">"通用"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"僅限 EvDo"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"CDMA (不具 EvDo)"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"CDMA/EvDo 自動切換"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"GSM/WCDMA 自動切換"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"僅限 WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"僅限 GSM"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"GSM/WCDMA 優先"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values-zu/strings.xml b/overlay-operators/packages/services/Telephony/res/values-zu/strings.xml
deleted file mode 100644
index 2248e87..0000000
--- a/overlay-operators/packages/services/Telephony/res/values-zu/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- -->
-
-<resources>
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_only_choice">"I-TD-SCDMA kuphela"</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">"I-LTE / WCDMA"</string>
-    <string name="preferred_network_mode_lte_choice">"I-LTE"</string>
-    <string name="preferred_network_mode_global_choice">"Emhlabeni jikelele"</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">"I-GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">"I-CDMA + LTE/EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">"I-CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_evdo_only_choice">"I-EvDo kuphela"</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">"I-CDMA w/o EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">"I-CDMA / EvDo ezenzakalelayo"</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">"Okuzenzakalelayo kwe-GSM /WCDMA"</string>
-    <string name="preferred_network_mode_wcdma_only_choice">"I-WCDMA kuphela"</string>
-    <string name="preferred_network_mode_gsm_only_choice">"I-GSM kuphela"</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">"Okukhethwayo kwe-GSM / WCDMA"</string>
-</resources>
diff --git a/overlay-operators/packages/services/Telephony/res/values/strings.xml b/overlay-operators/packages/services/Telephony/res/values/strings.xml
deleted file mode 100644
index 028b9bf..0000000
--- a/overlay-operators/packages/services/Telephony/res/values/strings.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="preferred_network_mode_choices" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice </item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_lte_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_choice</item>
-        <item>@string/preferred_network_mode_td_scdma_only_choice</item>
-        <item>@string/preferred_network_mode_lte_wcdma_choice</item>
-        <item>@string/preferred_network_mode_lte_choice</item>
-        <item>@string/preferred_network_mode_global_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte_choice</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma_choice</item>
-        <item>@string/preferred_network_mode_evdo_only_choice</item>
-        <item>@string/preferred_network_mode_cdma_wo_evdo_choice</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_auto_choice</item>
-        <item>@string/preferred_network_mode_wcdma_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_only_choice</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_preferred_choice</item>
-    </string-array>
-    <string-array name="preferred_network_mode_values"  translatable="false">
-        <item>"22"</item>
-        <item>"21"</item>
-        <item>"20"</item>
-        <item>"19"</item>
-        <item>"18"</item>
-        <item>"17"</item>
-        <item>"16"</item>
-        <item>"15"</item>
-        <item>"14"</item>
-        <item>"13"</item>
-        <item>"12"</item>
-        <item>"11"</item>
-        <item>"10"</item>
-        <item>"9"</item>
-        <item>"8"</item>
-        <item>"7"</item>
-        <item>"6"</item>
-        <item>"5"</item>
-        <item>"4"</item>
-        <item>"3"</item>
-        <item>"2"</item>
-        <item>"1"</item>
-        <item>"0"</item>
-    </string-array>
-    <string name="preferred_network_mode_td_scdma_lte_gsm_wcdma_cdma_evdo_choice">TD-SCDMA/LTE/GSM/WCDMA/CDMA/EVDO</string>
-    <string name="preferred_network_mode_td_scdma_gsm_wcdma_cdma_evdo_choice">TD-SCDMA/GSM/WCDMA/CDMA/EVDO</string>
-    <string name="preferred_network_mode_td_scdma_gsm_wcdma_lte_choice">TD-SCDMA/GSM/WCDMA/LTE</string>
-    <string name="preferred_network_mode_td_scdma_wcdma_lte_choice">TD-SCDMA/WCDMA/LTE</string>
-    <string name="preferred_network_mode_td_scdma_gsm_wcdma_choice">TD-SCDMA/GSM/WCDMA</string>
-    <string name="preferred_network_mode_td_scdma_gsm_lte_choice">TD-SCDMA/GSM/LTE</string>
-    <string name="preferred_network_mode_td_scdma_gsm_choice">TD-SCDMA/GSM</string>
-    <string name="preferred_network_mode_td_scdma_lte_choice">TD-SCDMA/LTE</string>
-    <string name="preferred_network_mode_td_scdma_wcdma_choice">TD-SCDMA/WCDMA</string>
-    <string name="preferred_network_mode_td_scdma_only_choice">TD-SCDMA only</string>
-    <string name="preferred_network_mode_lte_wcdma_choice">LTE / WCDMA</string>
-    <string name="preferred_network_mode_lte_choice">LTE</string>
-    <string name="preferred_network_mode_global_choice">Global</string>
-    <string name="preferred_network_mode_gsm_wcdma_lte_choice">GSM/WCDMA/LTE</string>
-    <string name="preferred_network_mode_cdma_lte_evdo_choice">CDMA + LTE/EvDo</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_choice">CDMA/EvDo/GSM/WCDMA</string>
-    <string name="preferred_network_mode_evdo_only_choice">EvDo only</string>
-    <string name="preferred_network_mode_cdma_wo_evdo_choice">CDMA w/o EvDo</string>
-    <string name="preferred_network_mode_cdma_evdo_auto_choice">CDMA/EvDo auto</string>
-    <string name="preferred_network_mode_gsm_wcdma_auto_choice">GSM/WCDMA auto</string>
-    <string name="preferred_network_mode_wcdma_only_choice">WCDMA only</string>
-    <string name="preferred_network_mode_gsm_only_choice">GSM only</string>
-    <string name="preferred_network_mode_gsm_wcdma_preferred_choice">GSM/WCDMA preferred</string>
-</resources>