diff --git a/res/values-az-rAZ-nokeys/strings.xml b/res/values-az-rAZ-nokeys/strings.xml
deleted file mode 100644
index 39d62d00f7c..00000000000
--- a/res/values-az-rAZ-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Tətbiqləri idarə edin"</string>
-</resources>
diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az/arrays.xml
similarity index 100%
rename from res/values-az-rAZ/arrays.xml
rename to res/values-az/arrays.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 100%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
diff --git a/res/values-be-rBY-nokeys/strings.xml b/res/values-be-rBY-nokeys/strings.xml
deleted file mode 100644
index 3d7e897eae2..00000000000
--- a/res/values-be-rBY-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Кіраванне прыкладаннямі"</string>
-</resources>
diff --git a/res/values-be-rBY/arrays.xml b/res/values-be/arrays.xml
similarity index 100%
rename from res/values-be-rBY/arrays.xml
rename to res/values-be/arrays.xml
diff --git a/res/values-be-rBY/strings.xml b/res/values-be/strings.xml
similarity index 100%
rename from res/values-be-rBY/strings.xml
rename to res/values-be/strings.xml
diff --git a/res/values-bn-rBD-nokeys/strings.xml b/res/values-bn-nokeys/strings.xml
similarity index 100%
rename from res/values-bn-rBD-nokeys/strings.xml
rename to res/values-bn-nokeys/strings.xml
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn/arrays.xml
similarity index 100%
rename from res/values-bn-rBD/arrays.xml
rename to res/values-bn/arrays.xml
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
similarity index 100%
rename from res/values-bn-rBD/strings.xml
rename to res/values-bn/strings.xml
diff --git a/res/values-bs-rBA-nokeys/strings.xml b/res/values-bs-nokeys/strings.xml
similarity index 100%
rename from res/values-bs-rBA-nokeys/strings.xml
rename to res/values-bs-nokeys/strings.xml
diff --git a/res/values-bs-rBA/arrays.xml b/res/values-bs/arrays.xml
similarity index 100%
rename from res/values-bs-rBA/arrays.xml
rename to res/values-bs/arrays.xml
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs/strings.xml
similarity index 100%
rename from res/values-bs-rBA/strings.xml
rename to res/values-bs/strings.xml
diff --git a/res/values-et-rEE-nokeys/strings.xml b/res/values-et-rEE-nokeys/strings.xml
deleted file mode 100644
index 39715f967dc..00000000000
--- a/res/values-et-rEE-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Rakenduste haldamine"</string>
-</resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et/arrays.xml
similarity index 100%
rename from res/values-et-rEE/arrays.xml
rename to res/values-et/arrays.xml
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 100%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
diff --git a/res/values-eu-rES-nokeys/strings.xml b/res/values-eu-nokeys/strings.xml
similarity index 100%
rename from res/values-eu-rES-nokeys/strings.xml
rename to res/values-eu-nokeys/strings.xml
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu/arrays.xml
similarity index 100%
rename from res/values-eu-rES/arrays.xml
rename to res/values-eu/arrays.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 100%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
diff --git a/res/values-gl-rES-nokeys/strings.xml b/res/values-gl-nokeys/strings.xml
similarity index 100%
rename from res/values-gl-rES-nokeys/strings.xml
rename to res/values-gl-nokeys/strings.xml
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl/arrays.xml
similarity index 100%
rename from res/values-gl-rES/arrays.xml
rename to res/values-gl/arrays.xml
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 100%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
diff --git a/res/values-gu-rIN-nokeys/strings.xml b/res/values-gu-nokeys/strings.xml
similarity index 100%
rename from res/values-gu-rIN-nokeys/strings.xml
rename to res/values-gu-nokeys/strings.xml
diff --git a/res/values-gu-rIN/arrays.xml b/res/values-gu/arrays.xml
similarity index 100%
rename from res/values-gu-rIN/arrays.xml
rename to res/values-gu/arrays.xml
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml
similarity index 100%
rename from res/values-gu-rIN/strings.xml
rename to res/values-gu/strings.xml
diff --git a/res/values-hy-rAM-nokeys/strings.xml b/res/values-hy-rAM-nokeys/strings.xml
deleted file mode 100644
index 9c76a6b0c76..00000000000
--- a/res/values-hy-rAM-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Կառավարել ծրագրերը"</string>
-</resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy/arrays.xml
similarity index 100%
rename from res/values-hy-rAM/arrays.xml
rename to res/values-hy/arrays.xml
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml
similarity index 100%
rename from res/values-hy-rAM/strings.xml
rename to res/values-hy/strings.xml
diff --git a/res/values-is-rIS-nokeys/strings.xml b/res/values-is-nokeys/strings.xml
similarity index 100%
rename from res/values-is-rIS-nokeys/strings.xml
rename to res/values-is-nokeys/strings.xml
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is/arrays.xml
similarity index 100%
rename from res/values-is-rIS/arrays.xml
rename to res/values-is/arrays.xml
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml
similarity index 100%
rename from res/values-is-rIS/strings.xml
rename to res/values-is/strings.xml
diff --git a/res/values-ka-rGE-nokeys/strings.xml b/res/values-ka-rGE-nokeys/strings.xml
deleted file mode 100644
index 01a33ed24b6..00000000000
--- a/res/values-ka-rGE-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"აპლიკაციების მართვა"</string>
-</resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka/arrays.xml
similarity index 100%
rename from res/values-ka-rGE/arrays.xml
rename to res/values-ka/arrays.xml
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml
similarity index 100%
rename from res/values-ka-rGE/strings.xml
rename to res/values-ka/strings.xml
diff --git a/res/values-kk-rKZ-nokeys/strings.xml b/res/values-kk-nokeys/strings.xml
similarity index 100%
rename from res/values-kk-rKZ-nokeys/strings.xml
rename to res/values-kk-nokeys/strings.xml
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk/arrays.xml
similarity index 100%
rename from res/values-kk-rKZ/arrays.xml
rename to res/values-kk/arrays.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml
similarity index 100%
rename from res/values-kk-rKZ/strings.xml
rename to res/values-kk/strings.xml
diff --git a/res/values-km-rKH-nokeys/strings.xml b/res/values-km-rKH-nokeys/strings.xml
deleted file mode 100644
index 080bac8a3b3..00000000000
--- a/res/values-km-rKH-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"គ្រប់គ្រង​កម្មវិធី"</string>
-</resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km/arrays.xml
similarity index 100%
rename from res/values-km-rKH/arrays.xml
rename to res/values-km/arrays.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml
similarity index 100%
rename from res/values-km-rKH/strings.xml
rename to res/values-km/strings.xml
diff --git a/res/values-kn-rIN-nokeys/strings.xml b/res/values-kn-nokeys/strings.xml
similarity index 100%
rename from res/values-kn-rIN-nokeys/strings.xml
rename to res/values-kn-nokeys/strings.xml
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn/arrays.xml
similarity index 100%
rename from res/values-kn-rIN/arrays.xml
rename to res/values-kn/arrays.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
similarity index 100%
rename from res/values-kn-rIN/strings.xml
rename to res/values-kn/strings.xml
diff --git a/res/values-ky-rKG-nokeys/strings.xml b/res/values-ky-nokeys/strings.xml
similarity index 100%
rename from res/values-ky-rKG-nokeys/strings.xml
rename to res/values-ky-nokeys/strings.xml
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky/arrays.xml
similarity index 100%
rename from res/values-ky-rKG/arrays.xml
rename to res/values-ky/arrays.xml
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml
similarity index 100%
rename from res/values-ky-rKG/strings.xml
rename to res/values-ky/strings.xml
diff --git a/res/values-lo-rLA-nokeys/strings.xml b/res/values-lo-rLA-nokeys/strings.xml
deleted file mode 100644
index 921e17710b2..00000000000
--- a/res/values-lo-rLA-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"ຈັດການແອັບພລິເຄຊັນ"</string>
-</resources>
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo/arrays.xml
similarity index 100%
rename from res/values-lo-rLA/arrays.xml
rename to res/values-lo/arrays.xml
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml
similarity index 100%
rename from res/values-lo-rLA/strings.xml
rename to res/values-lo/strings.xml
diff --git a/res/values-mk-rMK-nokeys/strings.xml b/res/values-mk-nokeys/strings.xml
similarity index 100%
rename from res/values-mk-rMK-nokeys/strings.xml
rename to res/values-mk-nokeys/strings.xml
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk/arrays.xml
similarity index 100%
rename from res/values-mk-rMK/arrays.xml
rename to res/values-mk/arrays.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml
similarity index 100%
rename from res/values-mk-rMK/strings.xml
rename to res/values-mk/strings.xml
diff --git a/res/values-ml-rIN-nokeys/strings.xml b/res/values-ml-nokeys/strings.xml
similarity index 100%
rename from res/values-ml-rIN-nokeys/strings.xml
rename to res/values-ml-nokeys/strings.xml
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml/arrays.xml
similarity index 100%
rename from res/values-ml-rIN/arrays.xml
rename to res/values-ml/arrays.xml
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
similarity index 100%
rename from res/values-ml-rIN/strings.xml
rename to res/values-ml/strings.xml
diff --git a/res/values-mn-rMN-nokeys/strings.xml b/res/values-mn-rMN-nokeys/strings.xml
deleted file mode 100644
index e86703e4480..00000000000
--- a/res/values-mn-rMN-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Аппликешн удирдах"</string>
-</resources>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn/arrays.xml
similarity index 100%
rename from res/values-mn-rMN/arrays.xml
rename to res/values-mn/arrays.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml
similarity index 100%
rename from res/values-mn-rMN/strings.xml
rename to res/values-mn/strings.xml
diff --git a/res/values-mr-rIN-nokeys/strings.xml b/res/values-mr-nokeys/strings.xml
similarity index 100%
rename from res/values-mr-rIN-nokeys/strings.xml
rename to res/values-mr-nokeys/strings.xml
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr/arrays.xml
similarity index 100%
rename from res/values-mr-rIN/arrays.xml
rename to res/values-mr/arrays.xml
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
similarity index 100%
rename from res/values-mr-rIN/strings.xml
rename to res/values-mr/strings.xml
diff --git a/res/values-ms-rMY-nokeys/strings.xml b/res/values-ms-rMY-nokeys/strings.xml
deleted file mode 100644
index 7da53ba857b..00000000000
--- a/res/values-ms-rMY-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"Urus aplikasi"</string>
-</resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms/arrays.xml
similarity index 100%
rename from res/values-ms-rMY/arrays.xml
rename to res/values-ms/arrays.xml
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
similarity index 100%
rename from res/values-ms-rMY/strings.xml
rename to res/values-ms/strings.xml
diff --git a/res/values-my-rMM-nokeys/strings.xml b/res/values-my-nokeys/strings.xml
similarity index 100%
rename from res/values-my-rMM-nokeys/strings.xml
rename to res/values-my-nokeys/strings.xml
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my/arrays.xml
similarity index 100%
rename from res/values-my-rMM/arrays.xml
rename to res/values-my/arrays.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml
similarity index 100%
rename from res/values-my-rMM/strings.xml
rename to res/values-my/strings.xml
diff --git a/res/values-ne-rNP-nokeys/strings.xml b/res/values-ne-rNP-nokeys/strings.xml
deleted file mode 100644
index 324a9185d1d..00000000000
--- a/res/values-ne-rNP-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"अनुप्रयोगहरू प्रबन्ध गर्नुहोस्"</string>
-</resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne/arrays.xml
similarity index 100%
rename from res/values-ne-rNP/arrays.xml
rename to res/values-ne/arrays.xml
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml
similarity index 100%
rename from res/values-ne-rNP/strings.xml
rename to res/values-ne/strings.xml
diff --git a/res/values-pa-rIN-nokeys/strings.xml b/res/values-pa-nokeys/strings.xml
similarity index 100%
rename from res/values-pa-rIN-nokeys/strings.xml
rename to res/values-pa-nokeys/strings.xml
diff --git a/res/values-pa-rIN/arrays.xml b/res/values-pa/arrays.xml
similarity index 100%
rename from res/values-pa-rIN/arrays.xml
rename to res/values-pa/arrays.xml
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml
similarity index 100%
rename from res/values-pa-rIN/strings.xml
rename to res/values-pa/strings.xml
diff --git a/res/values-si-rLK-nokeys/strings.xml b/res/values-si-rLK-nokeys/strings.xml
deleted file mode 100644
index 9c5a82c1e6f..00000000000
--- a/res/values-si-rLK-nokeys/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"යෙදුම් කළමනාකරණය කරන්න"</string>
-</resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si/arrays.xml
similarity index 100%
rename from res/values-si-rLK/arrays.xml
rename to res/values-si/arrays.xml
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml
similarity index 100%
rename from res/values-si-rLK/strings.xml
rename to res/values-si/strings.xml
diff --git a/res/values-sq-rAL-nokeys/strings.xml b/res/values-sq-nokeys/strings.xml
similarity index 100%
rename from res/values-sq-rAL-nokeys/strings.xml
rename to res/values-sq-nokeys/strings.xml
diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq/arrays.xml
similarity index 100%
rename from res/values-sq-rAL/arrays.xml
rename to res/values-sq/arrays.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
diff --git a/res/values-ta-rIN-nokeys/strings.xml b/res/values-ta-nokeys/strings.xml
similarity index 100%
rename from res/values-ta-rIN-nokeys/strings.xml
rename to res/values-ta-nokeys/strings.xml
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta/arrays.xml
similarity index 100%
rename from res/values-ta-rIN/arrays.xml
rename to res/values-ta/arrays.xml
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml
similarity index 100%
rename from res/values-ta-rIN/strings.xml
rename to res/values-ta/strings.xml
diff --git a/res/values-te-rIN-nokeys/strings.xml b/res/values-te-nokeys/strings.xml
similarity index 100%
rename from res/values-te-rIN-nokeys/strings.xml
rename to res/values-te-nokeys/strings.xml
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te/arrays.xml
similarity index 100%
rename from res/values-te-rIN/arrays.xml
rename to res/values-te/arrays.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
similarity index 100%
rename from res/values-te-rIN/strings.xml
rename to res/values-te/strings.xml
diff --git a/res/values-ur-rPK-nokeys/strings.xml b/res/values-ur-nokeys/strings.xml
similarity index 100%
rename from res/values-ur-rPK-nokeys/strings.xml
rename to res/values-ur-nokeys/strings.xml
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur/arrays.xml
similarity index 100%
rename from res/values-ur-rPK/arrays.xml
rename to res/values-ur/arrays.xml
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml
similarity index 100%
rename from res/values-ur-rPK/strings.xml
rename to res/values-ur/strings.xml
diff --git a/res/values-uz-rUZ-nokeys/strings.xml b/res/values-uz-nokeys/strings.xml
similarity index 100%
rename from res/values-uz-rUZ-nokeys/strings.xml
rename to res/values-uz-nokeys/strings.xml
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz/arrays.xml
similarity index 100%
rename from res/values-uz-rUZ/arrays.xml
rename to res/values-uz/arrays.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml
similarity index 100%
rename from res/values-uz-rUZ/strings.xml
rename to res/values-uz/strings.xml
diff --git a/tests/app/res/values-az-rAZ/strings.xml b/tests/app/res/values-az/strings.xml
similarity index 100%
rename from tests/app/res/values-az-rAZ/strings.xml
rename to tests/app/res/values-az/strings.xml
diff --git a/tests/app/res/values-be-rBY/strings.xml b/tests/app/res/values-be/strings.xml
similarity index 100%
rename from tests/app/res/values-be-rBY/strings.xml
rename to tests/app/res/values-be/strings.xml
diff --git a/tests/app/res/values-bn-rBD/strings.xml b/tests/app/res/values-bn/strings.xml
similarity index 100%
rename from tests/app/res/values-bn-rBD/strings.xml
rename to tests/app/res/values-bn/strings.xml
diff --git a/tests/app/res/values-bs-rBA/strings.xml b/tests/app/res/values-bs/strings.xml
similarity index 100%
rename from tests/app/res/values-bs-rBA/strings.xml
rename to tests/app/res/values-bs/strings.xml
diff --git a/tests/app/res/values-et-rEE/strings.xml b/tests/app/res/values-et/strings.xml
similarity index 100%
rename from tests/app/res/values-et-rEE/strings.xml
rename to tests/app/res/values-et/strings.xml
diff --git a/tests/app/res/values-eu-rES/strings.xml b/tests/app/res/values-eu/strings.xml
similarity index 100%
rename from tests/app/res/values-eu-rES/strings.xml
rename to tests/app/res/values-eu/strings.xml
diff --git a/tests/app/res/values-gl-rES/strings.xml b/tests/app/res/values-gl/strings.xml
similarity index 100%
rename from tests/app/res/values-gl-rES/strings.xml
rename to tests/app/res/values-gl/strings.xml
diff --git a/tests/app/res/values-gu-rIN/strings.xml b/tests/app/res/values-gu/strings.xml
similarity index 100%
rename from tests/app/res/values-gu-rIN/strings.xml
rename to tests/app/res/values-gu/strings.xml
diff --git a/tests/app/res/values-hy-rAM/strings.xml b/tests/app/res/values-hy/strings.xml
similarity index 100%
rename from tests/app/res/values-hy-rAM/strings.xml
rename to tests/app/res/values-hy/strings.xml
diff --git a/tests/app/res/values-is-rIS/strings.xml b/tests/app/res/values-is/strings.xml
similarity index 100%
rename from tests/app/res/values-is-rIS/strings.xml
rename to tests/app/res/values-is/strings.xml
diff --git a/tests/app/res/values-ka-rGE/strings.xml b/tests/app/res/values-ka/strings.xml
similarity index 100%
rename from tests/app/res/values-ka-rGE/strings.xml
rename to tests/app/res/values-ka/strings.xml
diff --git a/tests/app/res/values-kk-rKZ/strings.xml b/tests/app/res/values-kk/strings.xml
similarity index 100%
rename from tests/app/res/values-kk-rKZ/strings.xml
rename to tests/app/res/values-kk/strings.xml
diff --git a/tests/app/res/values-km-rKH/strings.xml b/tests/app/res/values-km/strings.xml
similarity index 100%
rename from tests/app/res/values-km-rKH/strings.xml
rename to tests/app/res/values-km/strings.xml
diff --git a/tests/app/res/values-kn-rIN/strings.xml b/tests/app/res/values-kn/strings.xml
similarity index 100%
rename from tests/app/res/values-kn-rIN/strings.xml
rename to tests/app/res/values-kn/strings.xml
diff --git a/tests/app/res/values-ky-rKG/strings.xml b/tests/app/res/values-ky/strings.xml
similarity index 100%
rename from tests/app/res/values-ky-rKG/strings.xml
rename to tests/app/res/values-ky/strings.xml
diff --git a/tests/app/res/values-lo-rLA/strings.xml b/tests/app/res/values-lo/strings.xml
similarity index 100%
rename from tests/app/res/values-lo-rLA/strings.xml
rename to tests/app/res/values-lo/strings.xml
diff --git a/tests/app/res/values-mk-rMK/strings.xml b/tests/app/res/values-mk/strings.xml
similarity index 100%
rename from tests/app/res/values-mk-rMK/strings.xml
rename to tests/app/res/values-mk/strings.xml
diff --git a/tests/app/res/values-ml-rIN/strings.xml b/tests/app/res/values-ml/strings.xml
similarity index 100%
rename from tests/app/res/values-ml-rIN/strings.xml
rename to tests/app/res/values-ml/strings.xml
diff --git a/tests/app/res/values-mn-rMN/strings.xml b/tests/app/res/values-mn/strings.xml
similarity index 100%
rename from tests/app/res/values-mn-rMN/strings.xml
rename to tests/app/res/values-mn/strings.xml
diff --git a/tests/app/res/values-mr-rIN/strings.xml b/tests/app/res/values-mr/strings.xml
similarity index 100%
rename from tests/app/res/values-mr-rIN/strings.xml
rename to tests/app/res/values-mr/strings.xml
diff --git a/tests/app/res/values-ms-rMY/strings.xml b/tests/app/res/values-ms/strings.xml
similarity index 100%
rename from tests/app/res/values-ms-rMY/strings.xml
rename to tests/app/res/values-ms/strings.xml
diff --git a/tests/app/res/values-my-rMM/strings.xml b/tests/app/res/values-my/strings.xml
similarity index 100%
rename from tests/app/res/values-my-rMM/strings.xml
rename to tests/app/res/values-my/strings.xml
diff --git a/tests/app/res/values-ne-rNP/strings.xml b/tests/app/res/values-ne/strings.xml
similarity index 100%
rename from tests/app/res/values-ne-rNP/strings.xml
rename to tests/app/res/values-ne/strings.xml
diff --git a/tests/app/res/values-pa-rIN/strings.xml b/tests/app/res/values-pa/strings.xml
similarity index 100%
rename from tests/app/res/values-pa-rIN/strings.xml
rename to tests/app/res/values-pa/strings.xml
diff --git a/tests/app/res/values-si-rLK/strings.xml b/tests/app/res/values-si/strings.xml
similarity index 100%
rename from tests/app/res/values-si-rLK/strings.xml
rename to tests/app/res/values-si/strings.xml
diff --git a/tests/app/res/values-sq-rAL/strings.xml b/tests/app/res/values-sq/strings.xml
similarity index 100%
rename from tests/app/res/values-sq-rAL/strings.xml
rename to tests/app/res/values-sq/strings.xml
diff --git a/tests/app/res/values-ta-rIN/strings.xml b/tests/app/res/values-ta/strings.xml
similarity index 100%
rename from tests/app/res/values-ta-rIN/strings.xml
rename to tests/app/res/values-ta/strings.xml
diff --git a/tests/app/res/values-te-rIN/strings.xml b/tests/app/res/values-te/strings.xml
similarity index 100%
rename from tests/app/res/values-te-rIN/strings.xml
rename to tests/app/res/values-te/strings.xml
diff --git a/tests/app/res/values-ur-rPK/strings.xml b/tests/app/res/values-ur/strings.xml
similarity index 100%
rename from tests/app/res/values-ur-rPK/strings.xml
rename to tests/app/res/values-ur/strings.xml
diff --git a/tests/app/res/values-uz-rUZ/strings.xml b/tests/app/res/values-uz/strings.xml
similarity index 100%
rename from tests/app/res/values-uz-rUZ/strings.xml
rename to tests/app/res/values-uz/strings.xml