Merge "Update permissions" into p9.0

commit: 20e45297d5d921fa7986288b1a750ab2a2e33e5f [log] [tgz]
author: Jack <jackeagle102@gmail.com> Thu Aug 08 16:34:55 2019 +0530
committer: Gerrit Code Review <gerrit2@LegacyServer> Thu Aug 08 16:34:55 2019 +0530
tree: fec2966abf7c74a367894dfdc921f5d0e6c17224
parent: 35340ca6dca1eb6c28677a1a69eb907cb2223958 [diff]
parent: bb3ccbb3baff7cf7789586739e4d0eafd8b543d9 [diff]
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
deleted file mode 100644
index d18384b..0000000
--- a/AndroidProducts.mk
+++ /dev/null

@@ -1,18 +0,0 @@
-#
-# Copyright 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/utils/emulator/bliss_emulator.mk

diff --git a/bliss.devices b/bliss.devices
index b3806bf..017f0d5 100644
--- a/bliss.devices
+++ b/bliss.devices

@@ -6,3 +6,4 @@
 hydrogen
 helium
 berkeley
+Z01R

diff --git a/build/core/vendor/qcom_boards.mk b/build/core/vendor/qcom_boards.mk
index 407a4e3..ed8f089 100644
--- a/build/core/vendor/qcom_boards.mk
+++ b/build/core/vendor/qcom_boards.mk

@@ -1,6 +1,11 @@
 # Board platforms lists to be used for
 # TARGET_BOARD_PLATFORM specific featurization
 
+# Platform name variables - used in makefiles everywhere
+MSMNILE := msmnile #SM8150
+MSMSTEPPE := sm6150
+TRINKET := trinket #SM6125
+
 # A Family
 QCOM_BOARD_PLATFORMS += msm7x27a
 QCOM_BOARD_PLATFORMS += msm7x30
@@ -36,6 +41,10 @@
 QCOM_BOARD_PLATFORMS += sdm710
 QCOM_BOARD_PLATFORMS += sdm845
 
+QCOM_BOARD_PLATFORMS += $(TRINKET)
+QCOM_BOARD_PLATFORMS += $(MSMSTEPPE)
+QCOM_BOARD_PLATFORMS += $(MSMNILE)
+
 # MSM7000 Family
 MSM7K_BOARD_PLATFORMS := msm7x30
 MSM7K_BOARD_PLATFORMS += msm7x27

diff --git a/build/envsetup.sh b/build/envsetup.sh
index 6825a7a..92b8c5f 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh

@@ -4,11 +4,12 @@
 Additional BlissRoms functions:
 - breakfast:       Setup the build environment, but only list
                    devices we support.
-- brunch:          Sets up build environment using breakfast(),
-                   and then comiles using mka() against blissify target.
 - mka:             Builds using SCHED_BATCH on all processors.
-- pushboot:        Push a file from your OUT dir to your phone and
-                   reboots it, using absolute path.
+- blissify:        Sets up build environment using breakfast(),
+                   and then compiles using mka() against blissify target.
+- aospremote:      Add git remote for matching AOSP repository.
+- cafremote:       Add git remote for matching CodeAurora repository.
+- losremote:       Add git remote for matching LineageOS repository.
 EOF
 }
 
@@ -77,29 +78,6 @@
     bliss_append_hmm "$1" "$2"
 }
 
-function blissremote()
-{
-    local proj pfx project
-
-    if ! git rev-parse &> /dev/null
-    then
-        echo "Not in a git directory. Please run this from an Android repository you wish to set up."
-        return
-    fi
-    git remote rm bliss 2> /dev/null
-
-    proj="$(pwd -P | sed "s#$ANDROID_BUILD_TOP/##g")"
-
-    if (echo "$proj" | egrep -q 'external|system|build|bionic|art|libcore|prebuilt|dalvik') ; then
-        pfx="platform_"
-    fi
-
-    project="${proj//\//_}"
-
-    git remote add bliss "git@github.com:BlissRoms/$pfx$project"
-    echo "Remote 'bliss' created"
-}
-
 function losremote()
 {
     local proj pfx project
@@ -226,18 +204,6 @@
     return $ret
 }
 
-function brunch()
-{
-    breakfast $*
-    if [ $? -eq 0 ]; then
-        time mka blissify
-    else
-        echo "No such item in brunch menu. Try 'breakfast'"
-        return 1
-    fi
-    return $?
-}
-
 function breakfast()
 {
     target=$1
@@ -273,6 +239,18 @@
 
 alias bib=breakfast
 
+function blissify()
+{
+    breakfast $*
+    if [ $? -eq 0 ]; then
+        time mka blissify
+    else
+        echo "No such item in brunch menu. Try 'breakfast'"
+        return 1
+    fi
+    return $?
+}
+
 function repopick() {
     T=$(gettop)
     $T/vendor/bliss/build/tools/repopick.py $@
@@ -307,21 +285,6 @@
     m -j$jobs "$@"
 }
 
-function pushboot() {
-    if [ ! -f $OUT/$* ]; then
-        echo "File not found: $OUT/$*"
-        return 1
-    fi
-
-    adb root
-    sleep 1
-    adb wait-for-device
-    adb remount
-
-    adb push $OUT/$* /$*
-    adb reboot
-}
-
 # Enable SD-LLVM if available
 if [ -d $(gettop)/prebuilts/snapdragon-llvm/toolchains ]; then
     case `uname -s` in
@@ -332,7 +295,7 @@
             export SDCLANG=true
             export SDCLANG_PATH=$(gettop)/prebuilts/snapdragon-llvm/toolchains/llvm-Snapdragon_LLVM_for_Android_4.0/prebuilt/linux-x86_64/bin
             export SDCLANG_PATH_2=$(gettop)/prebuilts/snapdragon-llvm/toolchains/llvm-Snapdragon_LLVM_for_Android_4.0/prebuilt/linux-x86_64/bin
-            export SDCLANG_LTO_DEFS=$(gettop)/vendor/lineage/build/core/sdllvm-lto-defs.mk
+            export SDCLANG_LTO_DEFS=$(gettop)/vendor/bliss/build/core/sdllvm-lto-defs.mk
             ;;
     esac
 fi

diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index 3dbf71d..5cd51e1 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go

@@ -3,12 +3,29 @@
 	Additional_gralloc_10_usage_bits struct {
 		Cppflags []string
 	}
-	Device_support_wait_for_qsee struct {
+	Apply_msm8974_1440p_egl_workaround struct {
 		Cflags []string
 	}
 	Has_legacy_camera_hal1 struct {
 		Cflags []string
 	}
+	Should_skip_waiting_for_qsee struct {
+		Cflags []string
+	}
+	Supports_hw_fde struct {
+		Cflags []string
+		Header_libs []string
+		Shared_libs []string
+	}
+	Supports_hw_fde_perf struct {
+		Cflags []string
+	}
+	Supports_legacy_hw_fde struct {
+		Cflags []string
+	}
+	Target_process_sdk_version_override struct {
+		Cppflags []string
+	}
 	Target_shim_libs struct {
 		Cppflags []string
 	}
@@ -28,38 +45,22 @@
 		Cppflags []string
 		Shared_libs []string
 	}
-	Should_skip_waiting_for_qsee struct {
-		Cflags []string
-	}
-	Supports_hw_fde struct {
-		Cflags []string
-		Header_libs []string
-		Shared_libs []string
-	}
-	Supports_hw_fde_perf struct {
-		Cflags []string
-	}
-	Supports_legacy_hw_fde struct {
-		Cflags []string
-	}
-	Target_process_sdk_version_override struct {
-		Cppflags []string
-	}
 }
 
 type ProductVariables struct {
 	Additional_gralloc_10_usage_bits  *string `json:",omitempty"`
+	Apply_msm8974_1440p_egl_workaround  *bool `json:",omitempty"`
 	Has_legacy_camera_hal1  *bool `json:",omitempty"`
 	Should_skip_waiting_for_qsee  *bool `json:",omitempty"`
 	Specific_camera_parameter_library  *string `json:",omitempty"`
 	Supports_hw_fde  *bool `json:",omitempty"`
 	Supports_hw_fde_perf  *bool `json:",omitempty"`
 	Supports_legacy_hw_fde  *bool `json:",omitempty"`
+	Target_process_sdk_version_override *string `json:",omitempty"`
 	Target_shim_libs  *string `json:",omitempty"`
 	Uses_generic_camera_parameter_library  *bool `json:",omitempty"`
 	Uses_metadata_as_fde_key  *bool `json:",omitempty"`
 	Uses_nvidia_enhancements  *bool `json:",omitempty"`
 	Uses_qcom_bsp_legacy  *bool `json:",omitempty"`
 	Uses_qti_camera_device  *bool `json:",omitempty"`
-	Target_process_sdk_version_override *string `json:",omitempty"`
 }

diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index 454793e..95e8d5f 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk

@@ -1,22 +1,24 @@
 add_json_str_omitempty = $(if $(strip $(2)),$(call add_json_str, $(1), $(2)))
+add_json_val_default = $(call add_json_val, $(1), $(if $(strip $(2)), $(2), $(3)))
 
 _contents := $(_contents)    "Bliss":{$(newline)
 
 # See build/core/soong_config.mk for the add_json_* functions you can use here.
 $(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS))
-$(call add_json_bool, Has_legacy_camera_hal1,                $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)))
-$(call add_json_str,  Specific_camera_parameter_library,     $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
-$(call add_json_str_omitempty, Target_shim_libs,             $(TARGET_LD_SHIM_LIBS))
-$(call add_json_bool, Uses_generic_camera_parameter_library, $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),false,true))
+$(call add_json_bool, Apply_msm8974_1440p_egl_workaround, $(filter true,$(TARGET_MSM8974_1440P_EGL_WORKAROUND)))
+$(call add_json_bool, Has_legacy_camera_hal1, $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)))
+$(call add_json_bool, Should_skip_waiting_for_qsee, $(filter true,$(TARGET_KEYMASTER_SKIP_WAITING_FOR_QSEE)))
+$(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
 $(call add_json_bool, Supports_hw_fde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
 $(call add_json_bool, Supports_hw_fde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
 $(call add_json_bool, Supports_legacy_hw_fde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))
-$(call add_json_bool, Should_skip_waiting_for_qsee, $(filter true,$(TARGET_KEYMASTER_SKIP_WAITING_FOR_QSEE)))
+$(call add_json_str_omitempty, Target_process_sdk_version_override, $(TARGET_PROCESS_SDK_VERSION_OVERRIDE))
+$(call add_json_str_omitempty, Target_shim_libs, $(TARGET_LD_SHIM_LIBS))
+$(call add_json_bool, Uses_generic_camera_parameter_library, $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),,true))
 $(call add_json_bool, Uses_metadata_as_fde_key, $(filter true,$(TARGET_USES_METADATA_AS_FDE_KEY)))
 $(call add_json_bool, Uses_nvidia_enhancements, $(filter TRUE,$(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)))
 $(call add_json_bool, Uses_qcom_bsp_legacy, $(filter true,$(TARGET_USES_QCOM_BSP_LEGACY)))
 $(call add_json_bool, Uses_qti_camera_device, $(filter true,$(TARGET_USES_QTI_CAMERA_DEVICE)))
-$(call add_json_str_omitempty, Target_process_sdk_version_override, $(TARGET_PROCESS_SDK_VERSION_OVERRIDE))
 
 # This causes the build system to strip out the last comma in our nested struct, to keep the JSON valid.
 _contents := $(_contents)__SV_END

diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index e4779a3..8857304 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk

@@ -66,6 +66,7 @@
 ## Internal variables
 KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
 KERNEL_CONFIG := $(KERNEL_OUT)/.config
+KERNEL_RELEASE := $(KERNEL_OUT)/include/config/kernel.release
 
 ifeq ($(KERNEL_ARCH),x86_64)
 KERNEL_DEFCONFIG_ARCH := x86
@@ -246,7 +247,8 @@
 	$(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
 			echo "Installing Kernel Modules"; \
 			$(call make-kernel-target,INSTALL_MOD_PATH=$(MODULES_INTERMEDIATES) modules_install); \
-			modules=$$(find $(MODULES_INTERMEDIATES) -type f -name '*.ko'); \
+			kernel_release=$$(cat $(KERNEL_RELEASE)) \
+			modules=$$(find $(MODULES_INTERMEDIATES)/lib/modules/$$kernel_release -type f -name '*.ko'); \
 			for f in $$modules; do \
 				$(KERNEL_TOOLCHAIN_PATH)strip --strip-unneeded $$f; \
 			done; \

diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 5bd042e..99339c0 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk

@@ -1,10 +1,16 @@
+# Platform names
+MSMNILE := msmnile #SM8150
+MSMSTEPPE := sm6150
+TRINKET := trinket #SM6125
+
 B_FAMILY := msm8226 msm8610 msm8974
 B64_FAMILY := msm8992 msm8994
 BR_FAMILY := msm8909 msm8916
 UM_3_18_FAMILY := msm8937 msm8953 msm8996
 UM_4_4_FAMILY := msm8998 sdm660
 UM_4_9_FAMILY := sdm845 sdm710
-UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY)
+UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET)
+UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)
 
 BOARD_USES_ADRENO := true
 
@@ -36,12 +42,21 @@
 endif
 
 # Enable DRM PP driver on UM platforms that support it
-ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY)),true)
+ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)),true)
     TARGET_USES_DRM_PP := true
 endif
 
+# Mark GRALLOC_USAGE_PRIVATE_WFD as valid gralloc bits
+TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
+TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 21)
+
+# Mark GRALLOC_USAGE_PRIVATE_10BIT_TP as valid gralloc bits on UM platforms that support it
+ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)),true)
+    TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 27)
+endif
+
 # List of targets that use master side content protection
-MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660 sdm845
+MASTER_SIDE_CP_TARGET_LIST := msm8996 $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)
 
 ifneq ($(filter $(B_FAMILY),$(TARGET_BOARD_PLATFORM)),)
     MSM_VIDC_TARGET_LIST := $(B_FAMILY)
@@ -61,16 +76,14 @@
 else ifneq ($(filter $(UM_4_9_FAMILY),$(TARGET_BOARD_PLATFORM)),)
     MSM_VIDC_TARGET_LIST := $(UM_4_9_FAMILY)
     QCOM_HARDWARE_VARIANT := sdm845
+else ifneq ($(filter $(UM_4_14_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+    MSM_VIDC_TARGET_LIST := $(UM_4_14_FAMILY)
+    QCOM_HARDWARE_VARIANT := sm8150
 else
     MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)
     QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM)
 endif
 
-# Allow a device to manually override which HALs it wants to use
-ifneq ($(OVERRIDE_QCOM_HARDWARE_VARIANT),)
-QCOM_HARDWARE_VARIANT := $(OVERRIDE_QCOM_HARDWARE_VARIANT)
-endif
-
 PRODUCT_SOONG_NAMESPACES += \
     hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT) \
     hardware/qcom/display-caf/$(QCOM_HARDWARE_VARIANT) \

diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 9c979e7..a07144f 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk

@@ -2,52 +2,37 @@
 PRODUCT_PACKAGES += \
     7z \
     awk \
-    bzip2 \
     bash \
+    bzip2 \
     curl \
-    fsck.exfat \
-    fsck.ntfs \
-    gdbserver \
+    getcap \
     htop \
-    libemoji \
-    libsepol \
     lib7z \
-    mke2fs \
-    mkfs.exfat \
-    mkfs.ntfs \
-    mount.ntfs \
-    micro_bench \
-    oprofiled \
-    powertop \
+    libsepol \
     pigz \
-    sqlite3 \
-    strace \
+    powertop \
+    setcap \
     unrar \
     unzip \
     vim \
     wget \
     zip
 
+# Filesystems tools
+PRODUCT_PACKAGES += \
+    fsck.exfat \
+    fsck.ntfs \
+    mke2fs \
+    mkfs.exfat \
+    mkfs.ntfs \
+    mount.ntfs
+
 # Telephony packages
 PRODUCT_PACKAGES += \
     messaging \
     CellBroadcastReceiver \
     Stk
 
-# Mms depends on SoundRecorder for recorded audio messages
-#PRODUCT_PACKAGES += \
-#    SoundRecorder
-
-# Include explicitly to work around GMS issues
-PRODUCT_PACKAGES += \
-    libprotobuf-cpp-full \
-    librsjni
-
-# Substratum
-#PRODUCT_PACKAGES += \
-#    SubstratumService
-
-
 # Misc Packages
 PRODUCT_PACKAGES += \
     ExactCalculator \
@@ -57,7 +42,8 @@
     Launcher3 \
     WallpaperPicker \
     BlissUpdater \
-    Lawnchair
+    Lawnchair \
+    CustomDoze
 
 # Additional apps
 PRODUCT_PACKAGES += \

diff --git a/config/common.mk b/config/common.mk
index c00544a..7a286cb 100644
--- a/config/common.mk
+++ b/config/common.mk

@@ -1,5 +1,3 @@
-PRODUCT_BRAND ?= bliss
-
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
 
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
@@ -65,8 +63,6 @@
     vendor/bliss/prebuilt/common/bin/sysinit:system/bin/sysinit \
     vendor/bliss/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner
 
-# Bliss Init files
-
 # Copy all Bliss specific init rc files
 $(foreach f,$(wildcard vendor/bliss/prebuilt/common/etc/init/*.rc),\
 $(eval PRODUCT_COPY_FILES += $(f):system/etc/init/$(notdir $f)))
@@ -93,8 +89,8 @@
 PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true
 
 # World APN list
-PRODUCT_COPY_FILES += \
-    vendor/bliss/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+PRODUCT_PACKAGES += \
+    apns-conf.xml
 
 #permissions
 PRODUCT_COPY_FILES += \

diff --git a/overlay/common/packages/providers/ContactsProvider/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/bools.xml
similarity index 78%
rename from overlay/common/packages/providers/ContactsProvider/res/values/config.xml
rename to overlay/common/frameworks/base/core/res/res/values/bools.xml
index 32ba32c..eef8c86 100644
--- a/overlay/common/packages/providers/ContactsProvider/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/bools.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2016 The Pure Nexus Project
-
+     Copyright (C) 2018 The BlissRoms Project
+	
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-
+	
           http://www.apache.org/licenses/LICENSE-2.0
-
+	
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources>
-    <string name="metadata_sync_pacakge">com.google.android.gms</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <bool name="config_alt_ambient_display">true</bool>
 </resources>

diff --git a/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_device.xml b/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_device.xml
deleted file mode 100644
index f7f3f8e..0000000
--- a/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_device.xml
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The Pure Nexus Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string-array name="vendor_required_apps_managed_device">
-        <item>com.android.vending</item>
-        <item>com.google.android.gms</item>
-        <item>com.google.android.contacts</item>
-        <item>com.google.android.googlequicksearchbox</item>
-        <item>com.google.android.launcher</item>
-        <item>com.android.launcher</item>
-        <item>com.google.android.dialer</item>
-        <item>com.google.android.apps.messaging</item>
-    </string-array>
-</resources>

diff --git a/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_profile.xml b/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_profile.xml
deleted file mode 100644
index bf2ce16..0000000
--- a/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_profile.xml
+++ /dev/null

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The Pure Nexus Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string-array name="vendor_required_apps_managed_profile">
-        <item>com.android.vending</item>
-        <item>com.google.android.gms</item>
-        <item>com.google.android.contacts</item>
-    </string-array>
-</resources>

diff --git a/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_user.xml b/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_user.xml
deleted file mode 100644
index 9e8372d..0000000
--- a/overlay/common/packages/apps/ManagedProvisioning/res/values/vendor_required_apps_managed_user.xml
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The Pure Nexus Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string-array name="vendor_required_apps_managed_user">
-        <item>com.android.vending</item>
-        <item>com.google.android.gms</item>
-        <item>com.google.android.contacts</item>
-        <item>com.google.android.googlequicksearchbox</item>
-        <item>com.google.android.launcher</item>
-        <item>com.android.launcher</item>
-        <item>com.google.android.dialer</item>
-        <item>com.google.android.apps.messaging</item>
-    </string-array>
-</resources>

diff --git a/overlay/common/packages/providers/ContactsProvider/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/bools.xml
similarity index 72%
copy from overlay/common/packages/providers/ContactsProvider/res/values/config.xml
copy to overlay/common/packages/apps/Settings/res/values/bools.xml
index 32ba32c..bb93789 100644
--- a/overlay/common/packages/providers/ContactsProvider/res/values/config.xml
+++ b/overlay/common/packages/apps/Settings/res/values/bools.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The Pure Nexus Project
+<!-- Copyright 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+     http://www.apache.org/licenses/LICENSE-2.0
 
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +13,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <resources>
-    <string name="metadata_sync_pacakge">com.google.android.gms</string>
+    <!-- Whether to show a preference item for mobile plan -->
+    <bool name="config_show_mobile_plan">false</bool>
 </resources>

diff --git a/overlay/common/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
new file mode 100644
index 0000000..1f619a7
--- /dev/null
+++ b/overlay/common/packages/apps/Settings/res/values/config.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2017 The BlissRoms Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Package name and fully-qualified class name for the wallpaper picker activity. -->
+    <string name="config_wallpaper_picker_package" translatable="false">com.google.android.apps.wallpaper</string>
+    <string name="config_wallpaper_picker_class" translatable="false">com.google.android.apps.wallpaper.picker.CategoryPickerActivity</string>
+
+    <!-- When true enable gesture setting. -->
+    <bool name="config_gesture_settings_enabled">true</bool>
+
+    <!-- If the Storage Manager settings are enabled. -->
+    <bool name="config_storage_manager_settings_enabled">true</bool>
+
+</resources>

diff --git a/overlay/common/packages/providers/CalendarProvider/res/drawable-hdpi/app_icon.png b/overlay/common/packages/providers/CalendarProvider/res/drawable-hdpi/app_icon.png
deleted file mode 100644
index 7057224..0000000
--- a/overlay/common/packages/providers/CalendarProvider/res/drawable-hdpi/app_icon.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/CalendarProvider/res/drawable-mdpi/app_icon.png b/overlay/common/packages/providers/CalendarProvider/res/drawable-mdpi/app_icon.png
deleted file mode 100644
index e24d7d7..0000000
--- a/overlay/common/packages/providers/CalendarProvider/res/drawable-mdpi/app_icon.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/CalendarProvider/res/drawable-xhdpi/app_icon.png b/overlay/common/packages/providers/CalendarProvider/res/drawable-xhdpi/app_icon.png
deleted file mode 100644
index aeea398..0000000
--- a/overlay/common/packages/providers/CalendarProvider/res/drawable-xhdpi/app_icon.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/CalendarProvider/res/drawable-xxhdpi/app_icon.png b/overlay/common/packages/providers/CalendarProvider/res/drawable-xxhdpi/app_icon.png
deleted file mode 100644
index 39a6b57..0000000
--- a/overlay/common/packages/providers/CalendarProvider/res/drawable-xxhdpi/app_icon.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/CalendarProvider/res/drawable-xxxhdpi/app_icon.png b/overlay/common/packages/providers/CalendarProvider/res/drawable-xxxhdpi/app_icon.png
deleted file mode 100644
index 7602e50..0000000
--- a/overlay/common/packages/providers/CalendarProvider/res/drawable-xxxhdpi/app_icon.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/MediaProvider/res/mipmap-hdpi/ic_launcher_gallery.png b/overlay/common/packages/providers/MediaProvider/res/mipmap-hdpi/ic_launcher_gallery.png
deleted file mode 100644
index 65d9f3c..0000000
--- a/overlay/common/packages/providers/MediaProvider/res/mipmap-hdpi/ic_launcher_gallery.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/MediaProvider/res/mipmap-mdpi/ic_launcher_gallery.png b/overlay/common/packages/providers/MediaProvider/res/mipmap-mdpi/ic_launcher_gallery.png
deleted file mode 100644
index 5eb1f62..0000000
--- a/overlay/common/packages/providers/MediaProvider/res/mipmap-mdpi/ic_launcher_gallery.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/MediaProvider/res/mipmap-xhdpi/ic_launcher_gallery.png b/overlay/common/packages/providers/MediaProvider/res/mipmap-xhdpi/ic_launcher_gallery.png
deleted file mode 100644
index aacb61b..0000000
--- a/overlay/common/packages/providers/MediaProvider/res/mipmap-xhdpi/ic_launcher_gallery.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/TelephonyProvider/res/mipmap-hdpi/ic_launcher_phone.png b/overlay/common/packages/providers/TelephonyProvider/res/mipmap-hdpi/ic_launcher_phone.png
deleted file mode 100644
index aa3f099..0000000
--- a/overlay/common/packages/providers/TelephonyProvider/res/mipmap-hdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/TelephonyProvider/res/mipmap-mdpi/ic_launcher_phone.png b/overlay/common/packages/providers/TelephonyProvider/res/mipmap-mdpi/ic_launcher_phone.png
deleted file mode 100644
index b554b7c..0000000
--- a/overlay/common/packages/providers/TelephonyProvider/res/mipmap-mdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/TelephonyProvider/res/mipmap-xhdpi/ic_launcher_phone.png b/overlay/common/packages/providers/TelephonyProvider/res/mipmap-xhdpi/ic_launcher_phone.png
deleted file mode 100644
index 5b9aff0..0000000
--- a/overlay/common/packages/providers/TelephonyProvider/res/mipmap-xhdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/providers/TelephonyProvider/res/mipmap-xxhdpi/ic_launcher_phone.png b/overlay/common/packages/providers/TelephonyProvider/res/mipmap-xxhdpi/ic_launcher_phone.png
deleted file mode 100644
index 4e204d4..0000000
--- a/overlay/common/packages/providers/TelephonyProvider/res/mipmap-xxhdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telecomm/res/drawable-hdpi/ic_launcher_sip_call.png b/overlay/common/packages/services/Telecomm/res/drawable-hdpi/ic_launcher_sip_call.png
deleted file mode 100644
index 282940c..0000000
--- a/overlay/common/packages/services/Telecomm/res/drawable-hdpi/ic_launcher_sip_call.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telecomm/res/drawable-mdpi/ic_launcher_sip_call.png b/overlay/common/packages/services/Telecomm/res/drawable-mdpi/ic_launcher_sip_call.png
deleted file mode 100644
index 560f7df..0000000
--- a/overlay/common/packages/services/Telecomm/res/drawable-mdpi/ic_launcher_sip_call.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telecomm/res/drawable-xhdpi/ic_launcher_sip_call.png b/overlay/common/packages/services/Telecomm/res/drawable-xhdpi/ic_launcher_sip_call.png
deleted file mode 100644
index 28c26a4..0000000
--- a/overlay/common/packages/services/Telecomm/res/drawable-xhdpi/ic_launcher_sip_call.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telecomm/res/mipmap-hdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telecomm/res/mipmap-hdpi/ic_launcher_phone.png
deleted file mode 100644
index aa3f099..0000000
--- a/overlay/common/packages/services/Telecomm/res/mipmap-hdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telecomm/res/mipmap-mdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telecomm/res/mipmap-mdpi/ic_launcher_phone.png
deleted file mode 100644
index b554b7c..0000000
--- a/overlay/common/packages/services/Telecomm/res/mipmap-mdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telecomm/res/mipmap-xhdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telecomm/res/mipmap-xhdpi/ic_launcher_phone.png
deleted file mode 100644
index 5b9aff0..0000000
--- a/overlay/common/packages/services/Telecomm/res/mipmap-xhdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telecomm/res/mipmap-xxhdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telecomm/res/mipmap-xxhdpi/ic_launcher_phone.png
deleted file mode 100644
index 4e204d4..0000000
--- a/overlay/common/packages/services/Telecomm/res/mipmap-xxhdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telecomm/res/mipmap-xxxhdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telecomm/res/mipmap-xxxhdpi/ic_launcher_phone.png
deleted file mode 100644
index 3efbee9..0000000
--- a/overlay/common/packages/services/Telecomm/res/mipmap-xxxhdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/drawable-hdpi/ic_launcher_sip_call.png b/overlay/common/packages/services/Telephony/res/drawable-hdpi/ic_launcher_sip_call.png
deleted file mode 100644
index 282940c..0000000
--- a/overlay/common/packages/services/Telephony/res/drawable-hdpi/ic_launcher_sip_call.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/drawable-mdpi/ic_launcher_sip_call.png b/overlay/common/packages/services/Telephony/res/drawable-mdpi/ic_launcher_sip_call.png
deleted file mode 100644
index 560f7df..0000000
--- a/overlay/common/packages/services/Telephony/res/drawable-mdpi/ic_launcher_sip_call.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/drawable-xhdpi/ic_launcher_sip_call.png b/overlay/common/packages/services/Telephony/res/drawable-xhdpi/ic_launcher_sip_call.png
deleted file mode 100644
index 28c26a4..0000000
--- a/overlay/common/packages/services/Telephony/res/drawable-xhdpi/ic_launcher_sip_call.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/mipmap-hdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telephony/res/mipmap-hdpi/ic_launcher_phone.png
deleted file mode 100644
index aa3f099..0000000
--- a/overlay/common/packages/services/Telephony/res/mipmap-hdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/mipmap-mdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telephony/res/mipmap-mdpi/ic_launcher_phone.png
deleted file mode 100644
index b554b7c..0000000
--- a/overlay/common/packages/services/Telephony/res/mipmap-mdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/mipmap-xhdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telephony/res/mipmap-xhdpi/ic_launcher_phone.png
deleted file mode 100644
index 5b9aff0..0000000
--- a/overlay/common/packages/services/Telephony/res/mipmap-xhdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/mipmap-xxhdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telephony/res/mipmap-xxhdpi/ic_launcher_phone.png
deleted file mode 100644
index 4e204d4..0000000
--- a/overlay/common/packages/services/Telephony/res/mipmap-xxhdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/mipmap-xxxhdpi/ic_launcher_phone.png b/overlay/common/packages/services/Telephony/res/mipmap-xxxhdpi/ic_launcher_phone.png
deleted file mode 100644
index 3efbee9..0000000
--- a/overlay/common/packages/services/Telephony/res/mipmap-xxxhdpi/ic_launcher_phone.png
+++ /dev/null
Binary files differ

diff --git a/overlay/common/packages/services/Telephony/res/values-af/strings.xml b/overlay/common/packages/services/Telephony/res/values-af/strings.xml
deleted file mode 100644
index 08de8a4..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-am/strings.xml b/overlay/common/packages/services/Telephony/res/values-am/strings.xml
deleted file mode 100644
index 218794c..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ar/strings.xml b/overlay/common/packages/services/Telephony/res/values-ar/strings.xml
deleted file mode 100644
index c9ce70c..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-az-rAZ/strings.xml b/overlay/common/packages/services/Telephony/res/values-az-rAZ/strings.xml
deleted file mode 100644
index cd8365d..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-bg/strings.xml b/overlay/common/packages/services/Telephony/res/values-bg/strings.xml
deleted file mode 100644
index 0ff2e8b..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-bn-rBD/strings.xml b/overlay/common/packages/services/Telephony/res/values-bn-rBD/strings.xml
deleted file mode 100644
index dca4ca4..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ca/strings.xml b/overlay/common/packages/services/Telephony/res/values-ca/strings.xml
deleted file mode 100644
index 9d0c8c2..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-cs/strings.xml b/overlay/common/packages/services/Telephony/res/values-cs/strings.xml
deleted file mode 100644
index 59d297c..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-da/strings.xml b/overlay/common/packages/services/Telephony/res/values-da/strings.xml
deleted file mode 100644
index 71156c9..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-de/strings.xml b/overlay/common/packages/services/Telephony/res/values-de/strings.xml
deleted file mode 100644
index 356eb0f..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-el/strings.xml b/overlay/common/packages/services/Telephony/res/values-el/strings.xml
deleted file mode 100644
index 124c03e..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-en-rGB/strings.xml b/overlay/common/packages/services/Telephony/res/values-en-rGB/strings.xml
deleted file mode 100644
index f45162a..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-en-rIN/strings.xml b/overlay/common/packages/services/Telephony/res/values-en-rIN/strings.xml
deleted file mode 100644
index f45162a..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-es-rUS/strings.xml b/overlay/common/packages/services/Telephony/res/values-es-rUS/strings.xml
deleted file mode 100644
index af1d354..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-es/strings.xml b/overlay/common/packages/services/Telephony/res/values-es/strings.xml
deleted file mode 100644
index 86fd79b..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-et-rEE/strings.xml b/overlay/common/packages/services/Telephony/res/values-et-rEE/strings.xml
deleted file mode 100644
index 38cb481..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-eu-rES/strings.xml b/overlay/common/packages/services/Telephony/res/values-eu-rES/strings.xml
deleted file mode 100644
index 502deb7..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-fa/strings.xml b/overlay/common/packages/services/Telephony/res/values-fa/strings.xml
deleted file mode 100644
index 9726416..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-fi/strings.xml b/overlay/common/packages/services/Telephony/res/values-fi/strings.xml
deleted file mode 100644
index d5277ca..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-fr-rCA/strings.xml b/overlay/common/packages/services/Telephony/res/values-fr-rCA/strings.xml
deleted file mode 100644
index 8203672..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-fr/strings.xml b/overlay/common/packages/services/Telephony/res/values-fr/strings.xml
deleted file mode 100644
index 8203672..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-gl-rES/strings.xml b/overlay/common/packages/services/Telephony/res/values-gl-rES/strings.xml
deleted file mode 100644
index b0e3e0b..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-hi/strings.xml b/overlay/common/packages/services/Telephony/res/values-hi/strings.xml
deleted file mode 100644
index 56d7d59..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-hr/strings.xml b/overlay/common/packages/services/Telephony/res/values-hr/strings.xml
deleted file mode 100644
index 95801f6..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-hu/strings.xml b/overlay/common/packages/services/Telephony/res/values-hu/strings.xml
deleted file mode 100644
index 2d661c1..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-hy-rAM/strings.xml b/overlay/common/packages/services/Telephony/res/values-hy-rAM/strings.xml
deleted file mode 100644
index ab8d710..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-in/strings.xml b/overlay/common/packages/services/Telephony/res/values-in/strings.xml
deleted file mode 100644
index b7b1b3d..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-is-rIS/strings.xml b/overlay/common/packages/services/Telephony/res/values-is-rIS/strings.xml
deleted file mode 100644
index 061b1c1..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-it/strings.xml b/overlay/common/packages/services/Telephony/res/values-it/strings.xml
deleted file mode 100644
index 3c67bba..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-iw/strings.xml b/overlay/common/packages/services/Telephony/res/values-iw/strings.xml
deleted file mode 100644
index 1b2f44d..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ja/strings.xml b/overlay/common/packages/services/Telephony/res/values-ja/strings.xml
deleted file mode 100644
index 19fab2f..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ka-rGE/strings.xml b/overlay/common/packages/services/Telephony/res/values-ka-rGE/strings.xml
deleted file mode 100644
index 2d28c0d..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-km-rKH/strings.xml b/overlay/common/packages/services/Telephony/res/values-km-rKH/strings.xml
deleted file mode 100644
index c37284f..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-kn-rIN/strings.xml b/overlay/common/packages/services/Telephony/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 2d02c16..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ko/strings.xml b/overlay/common/packages/services/Telephony/res/values-ko/strings.xml
deleted file mode 100644
index ae55803..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-lo-rLA/strings.xml b/overlay/common/packages/services/Telephony/res/values-lo-rLA/strings.xml
deleted file mode 100644
index 5f595ab..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-lt/strings.xml b/overlay/common/packages/services/Telephony/res/values-lt/strings.xml
deleted file mode 100644
index 7e22668..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-lv/strings.xml b/overlay/common/packages/services/Telephony/res/values-lv/strings.xml
deleted file mode 100644
index 36477b2..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ml-rIN/strings.xml b/overlay/common/packages/services/Telephony/res/values-ml-rIN/strings.xml
deleted file mode 100644
index eab1b71..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-mn-rMN/strings.xml b/overlay/common/packages/services/Telephony/res/values-mn-rMN/strings.xml
deleted file mode 100644
index 8f973c6..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-mr-rIN/strings.xml b/overlay/common/packages/services/Telephony/res/values-mr-rIN/strings.xml
deleted file mode 100644
index a14efa8..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ms-rMY/strings.xml b/overlay/common/packages/services/Telephony/res/values-ms-rMY/strings.xml
deleted file mode 100644
index 6e38854..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-nb/strings.xml b/overlay/common/packages/services/Telephony/res/values-nb/strings.xml
deleted file mode 100644
index 0da283c..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ne-rNP/strings.xml b/overlay/common/packages/services/Telephony/res/values-ne-rNP/strings.xml
deleted file mode 100644
index 58fa8dd..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-nl/strings.xml b/overlay/common/packages/services/Telephony/res/values-nl/strings.xml
deleted file mode 100644
index 9363661..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-pl/strings.xml b/overlay/common/packages/services/Telephony/res/values-pl/strings.xml
deleted file mode 100644
index e88aaca..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-pt-rPT/strings.xml b/overlay/common/packages/services/Telephony/res/values-pt-rPT/strings.xml
deleted file mode 100644
index da576bd..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-pt/strings.xml b/overlay/common/packages/services/Telephony/res/values-pt/strings.xml
deleted file mode 100644
index 3a75d27..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ro/strings.xml b/overlay/common/packages/services/Telephony/res/values-ro/strings.xml
deleted file mode 100644
index ba89a18..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ru/strings.xml b/overlay/common/packages/services/Telephony/res/values-ru/strings.xml
deleted file mode 100644
index e6ee76a..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-si-rLK/strings.xml b/overlay/common/packages/services/Telephony/res/values-si-rLK/strings.xml
deleted file mode 100644
index efabc42..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-sk/strings.xml b/overlay/common/packages/services/Telephony/res/values-sk/strings.xml
deleted file mode 100644
index 1654ba3..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-sl/strings.xml b/overlay/common/packages/services/Telephony/res/values-sl/strings.xml
deleted file mode 100644
index 6e781c0..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-sr/strings.xml b/overlay/common/packages/services/Telephony/res/values-sr/strings.xml
deleted file mode 100644
index 5a8933f..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-sv/strings.xml b/overlay/common/packages/services/Telephony/res/values-sv/strings.xml
deleted file mode 100644
index c7fd8d0..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-sw/strings.xml b/overlay/common/packages/services/Telephony/res/values-sw/strings.xml
deleted file mode 100644
index b7682eb..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ta-rIN/strings.xml b/overlay/common/packages/services/Telephony/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 6c25f56..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-te-rIN/strings.xml b/overlay/common/packages/services/Telephony/res/values-te-rIN/strings.xml
deleted file mode 100644
index 87cc12a..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-th/strings.xml b/overlay/common/packages/services/Telephony/res/values-th/strings.xml
deleted file mode 100644
index 00a04b4..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-tl/strings.xml b/overlay/common/packages/services/Telephony/res/values-tl/strings.xml
deleted file mode 100644
index 9253a9d..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-tr/strings.xml b/overlay/common/packages/services/Telephony/res/values-tr/strings.xml
deleted file mode 100644
index a897480..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-uk/strings.xml b/overlay/common/packages/services/Telephony/res/values-uk/strings.xml
deleted file mode 100644
index f1dbcc3..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-ur-rPK/strings.xml b/overlay/common/packages/services/Telephony/res/values-ur-rPK/strings.xml
deleted file mode 100644
index 9afd3b3..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-vi/strings.xml b/overlay/common/packages/services/Telephony/res/values-vi/strings.xml
deleted file mode 100644
index 40ba63b..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-zh-rCN/strings.xml b/overlay/common/packages/services/Telephony/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 4f0af97..0000000
--- a/overlay/common/packages/services/Telephony/res/values-zh-rCN/strings.xml
+++ /dev/null

@@ -1,69 +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>
-    <string name="preferred_network_mode_4g_3g_2g_auto">"4G/3G/2G (自动选择)"</string>
-    <string name="preferred_network_mode_3g_2g_auto">"3G/2G (自动选择)"</string>
-    <string name="preferred_network_mode_dialogtitle_show_radio_tech">"网络模式"</string>
-</resources>

diff --git a/overlay/common/packages/services/Telephony/res/values-zh-rHK/strings.xml b/overlay/common/packages/services/Telephony/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 88d200a..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-zh-rTW/strings.xml b/overlay/common/packages/services/Telephony/res/values-zh-rTW/strings.xml
deleted file mode 100644
index ed6eddc..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values-zu/strings.xml b/overlay/common/packages/services/Telephony/res/values-zu/strings.xml
deleted file mode 100644
index 2248e87..0000000
--- a/overlay/common/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/common/packages/services/Telephony/res/values/config.xml b/overlay/common/packages/services/Telephony/res/values/config.xml
deleted file mode 100644
index a0eee59..0000000
--- a/overlay/common/packages/services/Telephony/res/values/config.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    
-    <!-- Show enabled lte option for lte device -->
-    <bool name="config_enabled_lte" translatable="false">true</bool>
-
-</resources>

diff --git a/overlay/common/packages/services/Telephony/res/values/strings.xml b/overlay/common/packages/services/Telephony/res/values/strings.xml
deleted file mode 100644
index bbb3f3f..0000000
--- a/overlay/common/packages/services/Telephony/res/values/strings.xml
+++ /dev/null

@@ -1,107 +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>
-    <string name="preferred_network_mode_4g_3g_2g_auto">"4G/3G/2G (auto)"</string>
-    <string name="preferred_network_mode_3g_2g_auto">"3G/2G (auto)"</string>
-    <string name="preferred_network_mode_dialogtitle_show_radio_tech">Network mode</string>
-</resources>

diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
new file mode 100644
index 0000000..9043cd8
--- /dev/null
+++ b/prebuilt/common/Android.mk

@@ -0,0 +1,29 @@
+LOCAL_PATH := $(call my-dir)
+
+################################
+# Copies the APN list file into system/etc for the product as apns-conf.xml.
+# In the case where $(CUSTOM_APNS_FILE) is defined, the content of $(CUSTOM_APNS_FILE)
+# is added or replaced to the $(DEFAULT_APNS_FILE).
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := apns-conf.xml
+LOCAL_MODULE_CLASS := ETC
+
+DEFAULT_APNS_FILE := vendor/bliss/prebuilt/common/etc/apns-conf.xml
+
+ifdef CUSTOM_APNS_FILE
+CUSTOM_APNS_SCRIPT := vendor/bliss/tools/custom_apns.py
+FINAL_APNS_FILE := $(local-generated-sources-dir)/apns-conf.xml
+
+$(FINAL_APNS_FILE): PRIVATE_SCRIPT := $(CUSTOM_APNS_SCRIPT)
+$(FINAL_APNS_FILE): PRIVATE_CUSTOM_APNS_FILE := $(CUSTOM_APNS_FILE)
+$(FINAL_APNS_FILE): $(CUSTOM_APNS_SCRIPT) $(DEFAULT_APNS_FILE)
+	rm -f $@
+	python $(PRIVATE_SCRIPT) $@ $(PRIVATE_CUSTOM_APNS_FILE)
+else
+FINAL_APNS_FILE := $(DEFAULT_APNS_FILE)
+endif
+
+LOCAL_PREBUILT_MODULE_FILE := $(FINAL_APNS_FILE)
+
+include $(BUILD_PREBUILT)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 95c3b1e..c215885 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml

@@ -1309,9 +1309,6 @@
   <apn carrier="Sprint LTE internet" mcc="310" mnc="120" apn="n.ispsn" type="default,mms,supl,hipri,dun" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14" />
   <apn carrier="Sprint EHRPD internet" mcc="310" mnc="120" apn="n.ispsn" type="default,mms,supl,hipri" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="13" />
   <apn carrier="Sprint internet" mcc="310" mnc="120" apn="n.ispsn" type="mms,supl,hipri" mmsc="http://mms.sprintpcs.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" />
-  <apn carrier="Sprint LTE internet 2" mcc="310" mnc="120" apn="x.ispsn" type="default,mms,supl,hipri,dun" mmsc="http://mms.sprintpcs.com" mmsproxy="oap7.sprintpcs.com" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14" />
-  <apn carrier="Sprint EHRPD internet 2" mcc="310" mnc="120" apn="x.ispsn" type="default,mms,supl,hipri" mmsc="http://mms.sprintpcs.com" mmsproxy="oap7.sprintpcs.com" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="13" />
-  <apn carrier="Sprint internet 2" mcc="310" mnc="120" apn="x.ispsn" type="mms,supl,hipri" mmsc="http://mms.sprintpcs.com" mmsproxy="oap7.sprintpcs.com" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" /> 
   <apn carrier="Boost" mcc="310" mnc="120" apn="cinet.spcs" type="supl,mms,dun,fota" mmsc="http://mm.myboostmobile.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" />
   <apn carrier="Credo Mobile" mcc="310" mnc="120" apn="n.w1.ispsn" type="mms" mmsc="http://mms.plspictures.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" />
   <apn carrier="Ting" mcc="310" mnc="120" apn="n.t8.ispsn" type="supl,mms" mmsc="http://mms.plspictures.com" mmsproxy="68.28.31.7" mmsport="80" protocol="IPV4V6" roaming_protocol="IPV4V6" />

diff --git a/sepolicy/private/file.te b/sepolicy/private/file.te
deleted file mode 100644
index d01594e..0000000
--- a/sepolicy/private/file.te
+++ /dev/null

@@ -1,2 +0,0 @@
-type sysfs_block_scheduler, fs_type, sysfs_type;
-

diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
deleted file mode 100644
index b62ada7..0000000
--- a/sepolicy/private/file_contexts
+++ /dev/null

@@ -1,7 +0,0 @@
-# Postinstall
-/system/bin/backuptool_ab\.functions              u:object_r:otapreopt_chroot_exec:s0
-/system/bin/backuptool_ab\.sh                     u:object_r:otapreopt_chroot_exec:s0
-/system/bin/backuptool_postinstall\.sh            u:object_r:otapreopt_chroot_exec:s0
-
-# Set disk scheduler via init
-/sys/block/[^/]+/queue/scheduler                   u:object_r:sysfs_block_scheduler:s0

diff --git a/sepolicy/private/hal_bootctl.te b/sepolicy/private/hal_bootctl.te
deleted file mode 100644
index 0b8be88..0000000
--- a/sepolicy/private/hal_bootctl.te
+++ /dev/null

@@ -1,2 +0,0 @@
-allow hal_bootctl self:capability sys_admin;
-

diff --git a/sepolicy/private/init.te b/sepolicy/private/init.te
deleted file mode 100644
index 3491baf..0000000
--- a/sepolicy/private/init.te
+++ /dev/null

@@ -1,7 +0,0 @@
-# Set disk scheduler in init.local.rc
-allow init sysfs_block_scheduler:file { open setattr write };
-
-# Mount debugfs in init.local.rc
-userdebug_or_eng(`
-  allow init debugfs:dir mounton;
-')

diff --git a/sepolicy/private/otapreopt_chroot.te b/sepolicy/private/otapreopt_chroot.te
deleted file mode 100644
index d733f14..0000000
--- a/sepolicy/private/otapreopt_chroot.te
+++ /dev/null

@@ -1,2 +0,0 @@
-allow otapreopt_chroot postinstall_file:lnk_file read;
-allow otapreopt_chroot system_file:dir mounton;

diff --git a/sepolicy/private/platform_app.te b/sepolicy/private/platform_app.te
deleted file mode 100644
index 7652ae9..0000000
--- a/sepolicy/private/platform_app.te
+++ /dev/null

@@ -1 +0,0 @@
-allow platform_app kernel:system syslog_read;

diff --git a/sepolicy/private/priv_app.te b/sepolicy/private/priv_app.te
deleted file mode 100644
index 423003d..0000000
--- a/sepolicy/private/priv_app.te
+++ /dev/null

@@ -1,2 +0,0 @@
-allow priv_app ota_package_file:dir create_dir_perms;
-allow priv_app kernel:system syslog_read;

diff --git a/sepolicy/private/rootfs.te b/sepolicy/private/rootfs.te
deleted file mode 100644
index 9404006..0000000
--- a/sepolicy/private/rootfs.te
+++ /dev/null

@@ -1,2 +0,0 @@
-allow rootfs labeledfs:filesystem associate;
-

diff --git a/sepolicy/private/sdcardfs.te b/sepolicy/private/sdcardfs.te
deleted file mode 100644
index dc697b0..0000000
--- a/sepolicy/private/sdcardfs.te
+++ /dev/null

@@ -1,2 +0,0 @@
-allow sdcardfs labeledfs:filesystem associate;
-

diff --git a/sepolicy/private/shell.te b/sepolicy/private/shell.te
deleted file mode 100644
index b9d6dcf..0000000
--- a/sepolicy/private/shell.te
+++ /dev/null

@@ -1,2 +0,0 @@
-allow shell otapreopt_chroot_exec:file getattr;
-allow shell kernel:system syslog_read;

diff --git a/sepolicy/private/system_app.te b/sepolicy/private/system_app.te
deleted file mode 100644
index 08e4db4..0000000
--- a/sepolicy/private/system_app.te
+++ /dev/null

@@ -1,4 +0,0 @@
-#selinux status
-allow system_app selinuxfs:file r_file_perms;
-
-

diff --git a/sepolicy/private/update_engine.te b/sepolicy/private/update_engine.te
deleted file mode 100644
index d2ddcbe..0000000
--- a/sepolicy/private/update_engine.te
+++ /dev/null

@@ -1,21 +0,0 @@
-r_dir_file(update_engine, mnt_user_file)
-r_dir_file(update_engine, storage_file)
-
-allow update_engine self:capability { chown fsetid };
-
-allow update_engine labeledfs:filesystem { mount unmount };
-
-allow update_engine { otapreopt_chroot_exec toolbox_exec }:file rx_file_perms;
-
-allow update_engine labeledfs:filesystem mount;
-allow update_engine rootfs:file { create setattr write rx_file_perms unlink relabelfrom rename };
-allow update_engine rootfs:dir { create write open add_name read rmdir remove_name };
-
-allow update_engine system_data_file:file { create read write open unlink };
-allow update_engine system_data_file:dir { create write add_name read remove_name unlink };
-
-allow update_engine system_file:file { create setattr write relabelto relabelfrom rx_file_perms unlink };
-allow update_engine system_file:dir { create setattr write rmdir remove_name add_name };
-
-allow update_engine storage_file:lnk_file read;
-allow update_engine toolbox_exec:file { execute getattr };

diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk
deleted file mode 100644
index e806594..0000000
--- a/sepolicy/sepolicy.mk
+++ /dev/null

@@ -1,9 +0,0 @@
-#
-# This policy configuration will be used by all products that
-# inherit from Bliss
-#
-
-BOARD_SEPOLICY_DIRS += \
-    vendor/bliss/sepolicy/common
-
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR += vendor/bliss/sepolicy/private

diff --git a/tools/custom_apns.py b/tools/custom_apns.py
new file mode 100644
index 0000000..9ba0907
--- /dev/null
+++ b/tools/custom_apns.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2018 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import sys
+from xml.dom.minidom import parseString
+
+def main(argv):
+    reload(sys)
+    sys.setdefaultencoding('utf8')
+    original_file = 'vendor/bliss/prebuilt/common/etc/apns-conf.xml'
+
+    if len(argv) == 3:
+        output_file_path = argv[1]
+        custom_override_file = argv[2]
+    else:
+        raise ValueError("Wrong number of arguments %s" % len(argv))
+
+    custom_apn_names = []
+    with open(custom_override_file, 'r') as f:
+        for line in f:
+            xmltree = parseString(line)
+            carrier = xmltree.getElementsByTagName('apn')[0].getAttribute('carrier')
+            custom_apn_names.append(carrier)
+
+    with open(original_file, 'r') as input_file:
+        with open(output_file_path, 'w') as output_file:
+            for line in input_file:
+                writeOriginalLine = True
+                for apn in custom_apn_names:
+                    if apn in line:
+                        with open(custom_override_file, 'r') as custom_file:
+                            for override_line in custom_file:
+                                if apn in override_line:
+                                    output_file.write(override_line)
+                                    writeOriginalLine = False
+                                    custom_apn_names.remove(apn)
+                if writeOriginalLine:
+                    if "</apns>" in line:
+                        if custom_apn_names:
+                            for apn in custom_apn_names:
+                                with open(custom_override_file, 'r') as custom_file:
+                                    for override_line in custom_file:
+                                        if apn in override_line:
+                                            output_file.write(override_line)
+                    output_file.write(line)
+
+if __name__ == '__main__':
+    main(sys.argv)

diff --git a/utils/Android.mk b/utils/Android.mk
deleted file mode 100644
index 20bfbaf..0000000
--- a/utils/Android.mk
+++ /dev/null

@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2011 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# WARNING: Everything listed here will be built on ALL platforms,
-# including x86, the emulator, and the SDK.  Modules must be uniquely
-# named (liblights.panda), and must build everywhere, or limit themselves
-# to only building on ARM if they include assembly. Individual makefiles
-# are responsible for having their own logic, for fine-grained control.
-
-LOCAL_PATH := $(call my-dir)
-
-# if some modules are built directly from this directory (not subdirectories),
-# their rules should be written here.
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/utils/emulator/Android.mk b/utils/emulator/Android.mk
deleted file mode 100644
index 20bfbaf..0000000
--- a/utils/emulator/Android.mk
+++ /dev/null

@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2011 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# WARNING: Everything listed here will be built on ALL platforms,
-# including x86, the emulator, and the SDK.  Modules must be uniquely
-# named (liblights.panda), and must build everywhere, or limit themselves
-# to only building on ARM if they include assembly. Individual makefiles
-# are responsible for having their own logic, for fine-grained control.
-
-LOCAL_PATH := $(call my-dir)
-
-# if some modules are built directly from this directory (not subdirectories),
-# their rules should be written here.
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/utils/emulator/GoldfishParts/Android.mk b/utils/emulator/GoldfishParts/Android.mk
deleted file mode 100644
index 29c3764..0000000
--- a/utils/emulator/GoldfishParts/Android.mk
+++ /dev/null

@@ -1,25 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := GoldfishParts
-LOCAL_CERTIFICATE := platform
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-package_resource_overlays := $(strip \
-    $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \
-      $(addprefix $(dir)/, packages/apps/GoldfishParts/res))) \
-    $(wildcard $(foreach dir, $(DEVICE_PACKAGE_OVERLAYS), \
-      $(addprefix $(dir)/, packages/apps/GoldfishParts/res))))
-
-LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_DEX_PREOPT := false
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/utils/emulator/GoldfishParts/AndroidManifest.xml b/utils/emulator/GoldfishParts/AndroidManifest.xml
deleted file mode 100644
index 2cf898d..0000000
--- a/utils/emulator/GoldfishParts/AndroidManifest.xml
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.bliss.device"
-    android:sharedUserId="android.uid.system" >
-
-    <uses-sdk
-        android:minSdkVersion="18"
-        android:targetSdkVersion="21" />
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/advanced_settings"
-        android:theme="@android:style/Theme.DeviceDefault.Settings"
-        android:supportsRtl="true" >
-        <activity
-            android:name="org.bliss.device.DeviceSettings"
-            android:exported="true"
-            android:label="@string/advanced_settings"
-            android:launchMode="singleTask" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <!--<category android:name="android.intent.category.LAUNCHER" />-->
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

diff --git a/utils/emulator/GoldfishParts/res/drawable-hdpi/ic_launcher.png b/utils/emulator/GoldfishParts/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 1e6b480..0000000
--- a/utils/emulator/GoldfishParts/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/GoldfishParts/res/drawable-mdpi/ic_launcher.png b/utils/emulator/GoldfishParts/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 89d59c6..0000000
--- a/utils/emulator/GoldfishParts/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/GoldfishParts/res/drawable-xhdpi/ic_launcher.png b/utils/emulator/GoldfishParts/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 6445baa..0000000
--- a/utils/emulator/GoldfishParts/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/GoldfishParts/res/drawable-xxhdpi/ic_launcher.png b/utils/emulator/GoldfishParts/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 2a5bb38..0000000
--- a/utils/emulator/GoldfishParts/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_camera.xml b/utils/emulator/GoldfishParts/res/drawable/ic_camera.xml
deleted file mode 100644
index 8294f4b..0000000
--- a/utils/emulator/GoldfishParts/res/drawable/ic_camera.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<!-- drawable/camera.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
-    android:width="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent" >
-    <path android:fillColor="#fff" android:pathData="M4,4H7L9,2H15L17,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4M12,7A5,5 0 0,0 7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9Z" />
-</vector>

diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_disabled.xml b/utils/emulator/GoldfishParts/res/drawable/ic_disabled.xml
deleted file mode 100644
index 1c5152b..0000000
--- a/utils/emulator/GoldfishParts/res/drawable/ic_disabled.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="32dp"
-        android:width="32dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorAccent" >
-    <path android:fillColor="#fff" android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"/>
-</vector>

diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_flashlight.xml b/utils/emulator/GoldfishParts/res/drawable/ic_flashlight.xml
deleted file mode 100644
index 213a7f6..0000000
--- a/utils/emulator/GoldfishParts/res/drawable/ic_flashlight.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<!-- drawable/flashlight.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
-    android:width="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent" >
-    <path android:fillColor="#fff" android:pathData="M9,10L6,5H18L15,10H9M18,4H6V2H18V4M9,22V11H15V22H9M12,13A1,1 0 0,0 11,14A1,1 0 0,0 12,15A1,1 0 0,0 13,14A1,1 0 0,0 12,13Z" />
-</vector>

diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_music_next.xml b/utils/emulator/GoldfishParts/res/drawable/ic_music_next.xml
deleted file mode 100644
index baad21d..0000000
--- a/utils/emulator/GoldfishParts/res/drawable/ic_music_next.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<!-- drawable/skip_next.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
-    android:width="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent" >
-    <path android:fillColor="#fff" android:pathData="M16,18H18V6H16M6,18L14.5,12L6,6V18Z" />
-</vector>

diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_music_play.xml b/utils/emulator/GoldfishParts/res/drawable/ic_music_play.xml
deleted file mode 100644
index d8c3ba8..0000000
--- a/utils/emulator/GoldfishParts/res/drawable/ic_music_play.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<!-- drawable/play.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
-    android:width="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent" >
-    <path android:fillColor="#fff" android:pathData="M8,5.14V19.14L19,12.14L8,5.14Z" />
-</vector>

diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_music_prev.xml b/utils/emulator/GoldfishParts/res/drawable/ic_music_prev.xml
deleted file mode 100644
index 199fcd1..0000000
--- a/utils/emulator/GoldfishParts/res/drawable/ic_music_prev.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<!-- drawable/skip_previous.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32dp"
-    android:width="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent" >
-    <path android:fillColor="#fff" android:pathData="M6,18V6H8V18H6M9.5,12L18,6V18L9.5,12Z" />
-</vector>

diff --git a/utils/emulator/GoldfishParts/res/layout/applist_preference.xml b/utils/emulator/GoldfishParts/res/layout/applist_preference.xml
deleted file mode 100644
index 62c9137..0000000
--- a/utils/emulator/GoldfishParts/res/layout/applist_preference.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-           android:id="@+id/app_icon"
-           android:layout_width="42dp"
-           android:layout_height="42dp"
-           android:padding="2dp"
-           android:scaleType="centerInside" />

diff --git a/utils/emulator/GoldfishParts/res/layout/applist_preference_icon.xml b/utils/emulator/GoldfishParts/res/layout/applist_preference_icon.xml
deleted file mode 100644
index 1d6425d..0000000
--- a/utils/emulator/GoldfishParts/res/layout/applist_preference_icon.xml
+++ /dev/null

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Layout for a Preference in a PreferenceActivity. The
-     Preference is able to place a specific widget for its particular
-     type in the "widget_frame" layout. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/widget_frame"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground">
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginEnd="12dip"
-        android:padding="2dp"
-        android:scaleType="centerInside"
-        android:layout_gravity="center" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="2dip"
-        android:layout_marginEnd="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:textColor="?android:attr/textColorPrimary"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
-
-    </RelativeLayout>
-
-</LinearLayout>

diff --git a/utils/emulator/GoldfishParts/res/layout/preference_dialog_vibrator_strength.xml b/utils/emulator/GoldfishParts/res/layout/preference_dialog_vibrator_strength.xml
deleted file mode 100644
index 0284852..0000000
--- a/utils/emulator/GoldfishParts/res/layout/preference_dialog_vibrator_strength.xml
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The OmniROM Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center_horizontal"
-        android:padding="24dip">
-
-        <ImageView android:id="@android:id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:contentDescription="@null" />
-
-        <SeekBar android:id="@*android:id/seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        <Button android:id="@+id/vib_test"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/vib_test"
-                android:layout_marginTop="10dip" />
-</LinearLayout>

diff --git a/utils/emulator/GoldfishParts/res/values/arrays.xml b/utils/emulator/GoldfishParts/res/values/arrays.xml
deleted file mode 100644
index 16ce0dd..0000000
--- a/utils/emulator/GoldfishParts/res/values/arrays.xml
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The OmniROM Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string-array name="slider_key_action_entries" translatable="false">
-        <item>@string/slider_mode_off</item>
-        <item>@string/slider_mode_vibrate</item>
-        <item>@string/slider_mode_silent</item>
-        <item>@string/slider_mode_priority</item>
-        <item>@string/slider_mode_alarm</item>
-        <item>@string/slider_mode_dnd</item>
-    </string-array>
-
-    <string-array name="slider_key_action_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-    </string-array>
-</resources>

diff --git a/utils/emulator/GoldfishParts/res/values/config.xml b/utils/emulator/GoldfishParts/res/values/config.xml
deleted file mode 100644
index 6cfe41f..0000000
--- a/utils/emulator/GoldfishParts/res/values/config.xml
+++ /dev/null

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2016 The OmniROM Project
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <bool name="config_has_oclick">false</bool>
-
-    <bool name="config_has_back_button">false</bool>
-
-</resources>

diff --git a/utils/emulator/GoldfishParts/res/values/strings.xml b/utils/emulator/GoldfishParts/res/values/strings.xml
deleted file mode 100644
index e7d7d64..0000000
--- a/utils/emulator/GoldfishParts/res/values/strings.xml
+++ /dev/null

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014-2017 The OmniROM Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <string name="app_name">Oneplus 3</string>
-    <string name="category_gestures_title">Off screen gestures</string>
-    <string name="category_vibrator">Vibrator</string>
-    <string name="vib_strength_title_head">Strength</string>
-    <string name="vib_strength_summary_head">Define the strength of the vibrator</string>
-    <string name="vib_test">Test</string>
-    <string name="advanced_settings">Advanced</string>
-    <string name="category_slider">Slider</string>
-    <string name="slider_mode_title">Slider mode</string>
-    <string name="buttons_title">Buttons</string>
-    <string name="swap_back_recents_summary"></string>
-    <string name="swap_back_recents_title">Swap back and recents button</string>
-    <string name="graphics_title">Graphics</string>
-    <string name="srgb_mode_summary"></string>
-    <string name="srgb_mode_title">sRGB mode</string>
-    <string name="hbm_mode_summary"></string>
-    <string name="hbm_mode_title">High brightness mode</string>
-    <string name="proxi_summary_head">Check proximity sensor for handling gesture and fingerprint sensor</string>
-    <string name="proxi_title_head">Proximity check</string>
-    <string name="slider_mode_off">Off</string>
-    <string name="slider_mode_vibrate">Vibrate</string>
-    <string name="slider_mode_silent">Silent</string>
-    <string name="slider_mode_priority">Priority only</string>
-    <string name="slider_mode_alarm">Alarms only</string>
-    <string name="slider_mode_dnd">Total silence</string>
-    <string name="slider_mode_title_top">Top position</string>
-    <string name="slider_mode_title_center">Center position</string>
-    <string name="slider_mode_title_bottom">Bottom position</string>
-    <string name="dci_mode_summary"></string>
-    <string name="dci_mode_title">Wide color gammut mode</string>
-
-    <string name="choose_app">Choose app</string>
-    <string name="category_double_swipe_gesture">II gesture</string>
-    <string name="gesture_app_title">Launch app</string>
-    <string name="category_circle_gesture">O gesture</string>
-    <string name="category_down_arrow_gesture">V gesture</string>
-    <string name="category_up_arrow_gesture">A gesture</string>
-    <string name="category_left_arrow_gesture">&lt; gesture</string>
-    <string name="category_right_arrow_gesture">&gt; gesture</string>
-    <string name="category_gestures_summary">Configure off screen gesture actions</string>
-    <string name="torch_entry">Flashlight</string>
-    <string name="disabled_entry">Disabled</string>
-    <string name="camera_entry">Camera</string>
-    <string name="music_play_entry">Play / pause music</string>
-    <string name="music_prev_entry">Prev track</string>
-    <string name="music_next_entry">Next track</string>
-    <string name="not_ready_summary">Resolving...</string>
-    <string name="resolve_failed_summary">Resolving app failed</string>
-    <string name="category_down_swipe_gesture">Down swipe</string>
-    <string name="category_up_swipe_gesture">Up swipe</string>
-    <string name="category_left_swipe_gesture">Left swipe</string>
-    <string name="category_right_swipe_gesture">Right swipe</string>
-</resources>

diff --git a/utils/emulator/GoldfishParts/res/xml/main.xml b/utils/emulator/GoldfishParts/res/xml/main.xml
deleted file mode 100644
index b28c71b..0000000
--- a/utils/emulator/GoldfishParts/res/xml/main.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014-2016 The OmniROM Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-</PreferenceScreen>

diff --git a/utils/emulator/GoldfishParts/src/org/bliss/device/DeviceSettings.java b/utils/emulator/GoldfishParts/src/org/bliss/device/DeviceSettings.java
deleted file mode 100644
index e4d2268..0000000
--- a/utils/emulator/GoldfishParts/src/org/bliss/device/DeviceSettings.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*
-* Copyright (C) 2016 The OmniROM Project
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.bliss.device;
-
-import android.content.res.Resources;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-
-public class DeviceSettings extends PreferenceActivity {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        addPreferencesFromResource(R.xml.main);
-    }
-}

diff --git a/utils/emulator/GoldfishParts/src/org/bliss/device/KeyHandler.java b/utils/emulator/GoldfishParts/src/org/bliss/device/KeyHandler.java
deleted file mode 100644
index 9fcc116..0000000
--- a/utils/emulator/GoldfishParts/src/org/bliss/device/KeyHandler.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*
-* Copyright (C) 2015 The OmniROM Project
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.bliss.device;
-
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-import android.view.KeyEvent;
-
-import com.android.internal.util.bliss.DeviceKeyHandler;
-
-public class KeyHandler implements DeviceKeyHandler {
-
-    private static final String TAG = KeyHandler.class.getSimpleName();
-    private static final boolean DEBUG = true;
-
-    public KeyHandler(Context context) {
-        if (DEBUG) Log.i(TAG, "KeyHandler");
-    }
-
-    @Override
-    public boolean handleKeyEvent(KeyEvent event) {
-        if (DEBUG) Log.i(TAG, "scanCode=" + event.getScanCode());
-        return false;
-    }
-
-    @Override
-    public boolean canHandleKeyEvent(KeyEvent event) {
-        if (DEBUG) Log.i(TAG, "canHandleKeyEvent=" + event.getScanCode());
-        return false;
-    }
-
-    @Override
-    public boolean isDisabledKeyEvent(KeyEvent event) {
-        if (DEBUG) Log.i(TAG, "isDisabledKeyEvent=" + event.getScanCode());
-        return false;
-    }
-
-    @Override
-    public boolean isCameraLaunchEvent(KeyEvent event) {
-        if (DEBUG) Log.i(TAG, "isCameraLaunchEvent=" + event.getScanCode());
-        return false;
-    }
-
-    @Override
-    public boolean isWakeEvent(KeyEvent event){
-        if (DEBUG) Log.i(TAG, "isWakeEvent=" + event.getScanCode());
-        return false;
-    }
-
-    @Override
-    public Intent isActivityLaunchEvent(KeyEvent event) {
-        if (DEBUG) Log.i(TAG, "isActivityLaunchEvent=" + event.getScanCode());
-        return null;
-    }
-}

diff --git a/utils/emulator/advancedFeatures.ini b/utils/emulator/advancedFeatures.ini
deleted file mode 100644
index 7f0bfe9..0000000
--- a/utils/emulator/advancedFeatures.ini
+++ /dev/null

@@ -1,9 +0,0 @@
-GrallocSync = on
-GLDMA = on
-LogcatPipe = on
-GLAsyncSwap = on
-GLESDynamicVersion = on
-EncryptUserData = on
-IntelPerformanceMonitoringUnit = on
-SystemAsRoot = on
-Wifi = on

diff --git a/utils/emulator/bliss_emulator.mk b/utils/emulator/bliss_emulator.mk
deleted file mode 100644
index 61e9b9f..0000000
--- a/utils/emulator/bliss_emulator.mk
+++ /dev/null

@@ -1,16 +0,0 @@
-PRODUCT_COPY_FILES += \
-    vendor/bliss/utils/emulator/fstab.ranchu:vendor/etc/fstab.ranchu \
-    vendor/bliss/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
-
-$(call inherit-product, build/target/product/sdk_x86.mk)
-
-$(call inherit-product, vendor/bliss/config/common.mk)
-
-$(call inherit-product, vendor/bliss/utils/emulator/common.mk)
-
-# Override product naming for Omni
-PRODUCT_NAME := bliss_emulator
-
-DEVICE_PACKAGE_OVERLAYS += vendor/bliss/utils/emulator/overlay
-
-ALLOW_MISSING_DEPENDENCIES := true 

diff --git a/utils/emulator/common.mk b/utils/emulator/common.mk
deleted file mode 100644
index 3bab7f0..0000000
--- a/utils/emulator/common.mk
+++ /dev/null

@@ -1,3 +0,0 @@
-PRODUCT_BRAND ?= bliss
-
-WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true

diff --git a/utils/emulator/create_emulator_image.sh b/utils/emulator/create_emulator_image.sh
deleted file mode 100755
index a918eaf..0000000
--- a/utils/emulator/create_emulator_image.sh
+++ /dev/null

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-if [ -z $ANDROID_BUILD_TOP ]; then
-    echo $ANDROID_BUILD_TOP undefined
-    exit 1
-fi
-
-if [ -z $ANDROID_PRODUCT_OUT ]; then
-    echo $ANDROID_PRODUCT_OUT undefined
-    exit 1
-fi
-
-if [ ! -f $ANDROID_PRODUCT_OUT/system.img ]; then
-    echo "Please build before running this"
-    exit 1
-fi
-
-# creates image zip in /tmp/
-cd $ANDROID_BUILD_TOP
-cp -r vendor/bliss/utils/emulator/skins $ANDROID_PRODUCT_OUT
-cp -r vendor/bliss/utils/emulator/start_emulator_image.sh $ANDROID_PRODUCT_OUT
-cp -r vendor/bliss/utils/emulator/advancedFeatures.ini $ANDROID_PRODUCT_OUT
-
-cd $ANDROID_PRODUCT_OUT/..
-rm /tmp/bliss_emulator.zip
-zip -r /tmp/bliss_emulator.zip generic_x86/skins generic_x86/system-qemu.img generic_x86/system/build.prop generic_x86/cache.img generic_x86/userdata.img generic_x86/start_emulator_image.sh generic_x86/advancedFeatures.ini generic_x86/vendor-qemu.img generic_x86/encryptionkey.img generic_x86/kernel-ranchu-64 generic_x86/ramdisk.img

diff --git a/utils/emulator/fstab.ranchu b/utils/emulator/fstab.ranchu
deleted file mode 100644
index 0c83d59..0000000
--- a/utils/emulator/fstab.ranchu
+++ /dev/null

@@ -1,6 +0,0 @@
-# Android fstab file.
-#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                              <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/dev/block/vdc                                          /data               ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic   wait,check,quota,forceencrypt=/dev/block/vdd
-/devices/*/block/vdf                                    auto                auto      defaults                                             voldmanaged=sdcard:auto,encryptable=userdata

diff --git a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index d62442c..0000000
--- a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- The list absolute paths of jar/apk files containing the device specific handlers,
-    delimited by File.pathSeparator, which defaults to ":" on Android -->
-    <string name="config_deviceKeyHandlerLib" translatable="false">/system/app/GoldfishParts/GoldfishParts.apk</string>
-    <!-- Full qualified name of the class that implements
-    com.android.internal.os.DeviceKeyHandler interface. -->
-    <string name="config_deviceKeyHandlerClass" translatable="false">org.omnirom.device.KeyHandler</string>
-    <!-- make sure you enable this only if your device supports deep slepp
-    with active proximity sensor event listener -->
-    <bool name="config_proxiSensorWakupCheck">true</bool>
-    <bool name="config_showNavigationBar">true</bool>
-    <bool name="config_haveHigherAspectRatioScreen">true</bool>
-</resources>

diff --git a/utils/emulator/packages.mk b/utils/emulator/packages.mk
deleted file mode 100644
index 493d4b5..0000000
--- a/utils/emulator/packages.mk
+++ /dev/null

@@ -1,17 +0,0 @@
-# Additional tools
-PRODUCT_PACKAGES += \
-    bash \
-    e2fsck \
-    fsck.exfat \
-    htop \
-    lsof \
-    mke2fs \
-    mount.exfat \
-    nano \
-    openvpn \
-    powertop \
-    tune2fs \
-    vim \
-    mkfs.ntfs \
-    mount.ntfs \
-    fsck.ntfs

diff --git a/utils/emulator/skins/pixel_2_xl/hardware.ini b/utils/emulator/skins/pixel_2_xl/hardware.ini
deleted file mode 100644
index 4b7959e..0000000
--- a/utils/emulator/skins/pixel_2_xl/hardware.ini
+++ /dev/null

@@ -1,44 +0,0 @@
-hw.cpu.arch = x86
-hw.cpu.model = qemu32
-hw.cpu.ncore = 2
-hw.ramSize = 1536
-hw.screen = multi-touch
-hw.mainKeys = false
-hw.trackBall = false
-hw.keyboard = true
-hw.keyboard.lid = false
-hw.keyboard.charmap = qwerty2
-hw.dPad = false
-hw.rotaryInput = false
-hw.gsmModem = true
-hw.gps = true
-hw.battery = true
-hw.accelerometer = true
-hw.gyroscope = true
-hw.audioInput = true
-hw.audioOutput = true
-hw.sdCard = false
-hw.lcd.width = 1440
-hw.lcd.height = 2880
-hw.lcd.depth = 16
-hw.lcd.density = 560
-hw.lcd.backlight = true
-hw.gpu.enabled = true
-hw.gpu.mode = host
-hw.gpu.blacklisted = no
-hw.initialOrientation = Portrait
-hw.camera.back = virtualscene
-hw.camera.front = emulated
-vm.heapSize = 384
-hw.sensors.light = true
-hw.sensors.pressure = true
-hw.sensors.humidity = true
-hw.sensors.proximity = true
-hw.sensors.magnetic_field = true
-hw.sensors.magnetic_field_uncalibrated = true
-hw.sensors.gyroscope_uncalibrated = true
-hw.sensors.orientation = true
-hw.sensors.temperature = true
-hw.useext4 = true
-hw.arc = false
-hw.arc.autologin = false

diff --git a/utils/emulator/skins/pixel_2_xl/land_back.webp b/utils/emulator/skins/pixel_2_xl/land_back.webp
deleted file mode 100644
index 45de491..0000000
--- a/utils/emulator/skins/pixel_2_xl/land_back.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_2_xl/land_fore.webp b/utils/emulator/skins/pixel_2_xl/land_fore.webp
deleted file mode 100644
index 7ee7fe9..0000000
--- a/utils/emulator/skins/pixel_2_xl/land_fore.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_2_xl/land_shadow.webp b/utils/emulator/skins/pixel_2_xl/land_shadow.webp
deleted file mode 100644
index 0db57b3..0000000
--- a/utils/emulator/skins/pixel_2_xl/land_shadow.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_2_xl/layout b/utils/emulator/skins/pixel_2_xl/layout
deleted file mode 100644
index abd5cd8..0000000
--- a/utils/emulator/skins/pixel_2_xl/layout
+++ /dev/null

@@ -1,59 +0,0 @@
-parts {
-  device {
-    display {
-      width 1440
-      height 2880
-      x 0
-      y 0
-    }
-  }
-  portrait {
-    background {
-      image port_back.webp
-    }
-    onion {
-      image port_fore.webp
-    }
-  }
-  landscape {
-    background {
-      image land_back.webp
-    }
-    onion {
-      image land_fore.webp
-    }
-  }
-}
-layouts {
-  portrait {
-    width 1858
-    height 3456
-    event EV_SW:0:1
-    part1 {
-      name portrait
-      x 0
-      y 0
-    }
-    part2 {
-      name device
-      x 201
-      y 245
-    }
-  }
-  landscape {
-    width 3477
-    height 1754
-    event EV_SW:0:0
-    part1 {
-      name landscape
-      x 0
-      y 0
-    }
-    part2 {
-      name device
-      x 305
-      y 108
-      rotation 3
-    }
-  }
-}

diff --git a/utils/emulator/skins/pixel_2_xl/port_back.webp b/utils/emulator/skins/pixel_2_xl/port_back.webp
deleted file mode 100644
index 914325d..0000000
--- a/utils/emulator/skins/pixel_2_xl/port_back.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_2_xl/port_fore.webp b/utils/emulator/skins/pixel_2_xl/port_fore.webp
deleted file mode 100644
index bdc562f..0000000
--- a/utils/emulator/skins/pixel_2_xl/port_fore.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_2_xl/port_shadow.webp b/utils/emulator/skins/pixel_2_xl/port_shadow.webp
deleted file mode 100644
index 0009913..0000000
--- a/utils/emulator/skins/pixel_2_xl/port_shadow.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_xl/hardware.ini b/utils/emulator/skins/pixel_xl/hardware.ini
deleted file mode 100644
index eeaae5c..0000000
--- a/utils/emulator/skins/pixel_xl/hardware.ini
+++ /dev/null

@@ -1,51 +0,0 @@
-hw.cpu.arch = x86
-hw.cpu.model = qemu32
-hw.cpu.ncore = 2
-hw.ramSize = 1536
-hw.screen = multi-touch
-hw.mainKeys = false
-hw.trackBall = false
-hw.keyboard = true
-hw.keyboard.lid = false
-hw.keyboard.charmap = qwerty2
-hw.dPad = false
-hw.rotaryInput = false
-hw.gsmModem = true
-hw.gps = true
-hw.battery = true
-hw.accelerometer = true
-hw.gyroscope = true
-hw.audioInput = true
-hw.audioOutput = true
-hw.lcd.width = 1440
-hw.lcd.height = 2560
-hw.lcd.depth = 16
-hw.lcd.density = 560
-hw.lcd.backlight = true
-hw.gpu.enabled = true
-hw.gpu.mode = host
-hw.gpu.blacklisted = no
-hw.initialOrientation = Portrait
-hw.camera.back = emulated
-hw.camera.front = emulated
-vm.heapSize = 384
-hw.sensors.light = true
-hw.sensors.pressure = true
-hw.sensors.humidity = true
-hw.sensors.proximity = true
-hw.sensors.magnetic_field = true
-hw.sensors.magnetic_field_uncalibrated = true
-hw.sensors.gyroscope_uncalibrated = true
-hw.sensors.orientation = true
-hw.sensors.temperature = true
-hw.useext4 = true
-kernel.newDeviceNaming = yes
-kernel.supportsYaffs2 = no
-disk.vendorPartition.size = 0
-hw.sensors.magnetic_field_uncalibrated = true
-hw.sensors.gyroscope_uncalibrated = true
-hw.sdCard = false
-hw.gyroscope = true
-runtime.network.latency=none
-runtime.network.speed=full
-

diff --git a/utils/emulator/skins/pixel_xl/land_back.webp b/utils/emulator/skins/pixel_xl/land_back.webp
deleted file mode 100644
index 5c5ee80..0000000
--- a/utils/emulator/skins/pixel_xl/land_back.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_xl/land_fore.webp b/utils/emulator/skins/pixel_xl/land_fore.webp
deleted file mode 100644
index ca70d12..0000000
--- a/utils/emulator/skins/pixel_xl/land_fore.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_xl/land_shadow.webp b/utils/emulator/skins/pixel_xl/land_shadow.webp
deleted file mode 100644
index 1718061..0000000
--- a/utils/emulator/skins/pixel_xl/land_shadow.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_xl/layout b/utils/emulator/skins/pixel_xl/layout
deleted file mode 100644
index debc6f7..0000000
--- a/utils/emulator/skins/pixel_xl/layout
+++ /dev/null

@@ -1,59 +0,0 @@
-parts {
-  device {
-    display {
-      width 1440
-      height 2560
-      x 0
-      y 0
-    }
-  }
-  portrait {
-    background {
-      image port_back.webp
-    }
-    onion {
-      image port_fore.webp
-    }
-  }
-  landscape {
-    background {
-      image land_back.webp
-    }
-    onion {
-      image land_fore.webp
-    }
-  }
-}
-layouts {
-  portrait {
-    width 1840
-    height 3297
-    event EV_SW:0:1
-    part1 {
-      name portrait
-      x 0
-      y 0
-    }
-    part2 {
-      name device
-      x 200
-      y 325
-    }
-  }
-  landscape {
-    width 3427
-    height 1654
-    event EV_SW:0:0
-    part1 {
-      name landscape
-      x 0
-      y 0
-    }
-    part2 {
-      name device
-      x 393
-      y 1532
-      rotation 3
-    }
-  }
-}

diff --git a/utils/emulator/skins/pixel_xl/port_back.webp b/utils/emulator/skins/pixel_xl/port_back.webp
deleted file mode 100644
index 4020161..0000000
--- a/utils/emulator/skins/pixel_xl/port_back.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_xl/port_fore.webp b/utils/emulator/skins/pixel_xl/port_fore.webp
deleted file mode 100644
index f010e9c..0000000
--- a/utils/emulator/skins/pixel_xl/port_fore.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/skins/pixel_xl/port_shadow.webp b/utils/emulator/skins/pixel_xl/port_shadow.webp
deleted file mode 100644
index c82477a..0000000
--- a/utils/emulator/skins/pixel_xl/port_shadow.webp
+++ /dev/null
Binary files differ

diff --git a/utils/emulator/start_emulator_image.sh b/utils/emulator/start_emulator_image.sh
deleted file mode 100755
index 916a6ae..0000000
--- a/utils/emulator/start_emulator_image.sh
+++ /dev/null

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export ANDROID_BUILD_TOP=`pwd`
-export ANDROID_PRODUCT_OUT=`pwd`
-
-/home/maxl/Android/Sdk/emulator/emulator  -verbose -skindir $ANDROID_BUILD_TOP/skins/ -skin pixel_2_xl -gpu host -writable-system -qemu -cpu qemu64

diff --git a/utils/emulator/start_emulator_local.sh b/utils/emulator/start_emulator_local.sh
deleted file mode 100755
index ee09e40..0000000
--- a/utils/emulator/start_emulator_local.sh
+++ /dev/null

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# assumes the image zip has been extracted in /tmp
-
-emulator  -verbose -skindir $ANDROID_BUILD_TOP/vendor/bliss/utils/emulator/skins/ -skin pixel_xl -writable-system

diff --git a/vendorsetup.sh b/vendorsetup.sh
index 47d47f6..24a9628 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh

@@ -1,21 +1,3 @@
-#
-# Copyright 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-add_lunch_combo bliss_emulator-userdebug
-
 . "$(gettop)/vendor/bliss/build/envsetup.sh"
 
 bliss_device_combos
commit	20e45297d5d921fa7986288b1a750ab2a2e33e5f	[log] [tgz]
author	Jack <jackeagle102@gmail.com>	Thu Aug 08 16:34:55 2019 +0530
committer	Gerrit Code Review <gerrit2@LegacyServer>	Thu Aug 08 16:34:55 2019 +0530
tree	fec2966abf7c74a367894dfdc921f5d0e6c17224
parent	35340ca6dca1eb6c28677a1a69eb907cb2223958 [diff]
parent	bb3ccbb3baff7cf7789586739e4d0eafd8b543d9 [diff]