diff --git a/java/res/values-es-rUS-xlarge/strings.xml b/java/res/values-es-rUS-xlarge/strings.xml
index 3362f443d..f0915804d 100644
--- a/java/res/values-es-rUS-xlarge/strings.xml
+++ b/java/res/values-es-rUS-xlarge/strings.xml
@@ -78,19 +78,13 @@
     <!-- XL -->
     <string name="subtype_mode_sv_keyboard" msgid="3874083866564515371">"Teclado en sueco"</string>
     <!-- XL -->
+    <string name="subtype_mode_af_voice">"Voz en Afrikáans"</string>
+    <!-- XL -->
     <string name="subtype_mode_cs_voice" msgid="8290007904951946296">"Voz en checo"</string>
     <!-- XL -->
     <string name="subtype_mode_de_voice" msgid="672328729666823853">"Voz en alemán"</string>
     <!-- XL -->
-    <string name="subtype_mode_en_AU_voice" msgid="4170989257043892770">"Voz en inglés (Australia)"</string>
-    <!-- XL -->
-    <string name="subtype_mode_en_GB_voice" msgid="3134961988951205695">"Voz en inglés (Reino Unido)"</string>
-    <!-- XL -->
-    <string name="subtype_mode_en_IN_voice" msgid="5699787782487633128">"Voz en inglés (India)"</string>
-    <!-- XL -->
-    <string name="subtype_mode_en_NZ_voice" msgid="4121688717194804130">"Voz en inglés (Nueva Zelanda)"</string>
-    <!-- XL -->
-    <string name="subtype_mode_en_US_voice" msgid="8006563098744135975">"Voz en inglés (EE.UU.)"</string>
+    <string name="subtype_mode_en_voice">"Voz en inglés"</string>
     <!-- XL -->
     <string name="subtype_mode_es_voice" msgid="1243071504878834350">"Voz en español"</string>
     <!-- XL -->
@@ -108,9 +102,11 @@
     <!-- XL -->
     <string name="subtype_mode_tr_voice" msgid="5242644971865917801">"Voz en turco"</string>
     <!-- XL -->
-    <string name="subtype_mode_zh_CN_voice" msgid="4505329319557358473">"Voz en chino (China, simplificado)"</string>
+    <string name="subtype_mode_yue_voice">"Voz en chino, yue"</string>
     <!-- XL -->
-    <string name="subtype_mode_zh_TW_voice" msgid="3976996097508134329">"Voz en chino (Taiwán, tradicional)"</string>
+    <string name="subtype_mode_zh_voice">"Voz en chino, mandarín"</string>
+    <!-- XL -->
+    <string name="subtype_mode_zu_voice">"Voz en isiZulu"</string>
     <!-- XL -->
     <string name="prefs_usability_study_mode" msgid="8423000345880575687">"Modo estudio de usabilidad"</string>
 </resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 12534cbfd..f63d6816c 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -247,21 +247,14 @@
     <string name="subtype_mode_sr_keyboard">Serbian Keyboard</string>
     <!-- Description for Swedish keyboard subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_sv_keyboard">Swedish Keyboard</string>
-
+    <!-- Description for Afrikaans voice input subtype [CHAR LIMIT=35] -->
+    <string name="subtype_mode_af_voice">Afrikaans Voice</string>
     <!-- Description for Czech voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_cs_voice">Czech Voice</string>
     <!-- Description for German voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_de_voice">German Voice</string>
-    <!-- Description for English (Australia) voice input subtype [CHAR LIMIT=35] -->
-    <string name="subtype_mode_en_AU_voice">English (Australia) Voice</string>
-    <!-- Description for English (United Kingdom) voice input subtype [CHAR LIMIT=35] -->
-    <string name="subtype_mode_en_GB_voice">English (UK) Voice</string>
-    <!-- Description for English (India) voice input subtype [CHAR LIMIT=35] -->
-    <string name="subtype_mode_en_IN_voice">English (India) Voice</string>
-    <!-- Description for English (New Zealand) voice input subtype [CHAR LIMIT=35] -->
-    <string name="subtype_mode_en_NZ_voice">English (New Zealand) Voice</string>
-    <!-- Description for English (United States) voice input subtype [CHAR LIMIT=35] -->
-    <string name="subtype_mode_en_US_voice">English (US) Voice</string>
+    <!-- Description for English voice input subtype [CHAR LIMIT=35] -->
+    <string name="subtype_mode_en_voice">English Voice</string>
     <!-- Description for Spanish voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_es_voice">Spanish Voice</string>
     <!-- Description for French voice input subtype [CHAR LIMIT=35] -->
@@ -282,10 +275,12 @@
     <string name="subtype_mode_ru_voice">Russian Voice</string>
     <!-- Description for Turkish voice input subtype [CHAR LIMIT=35] -->
     <string name="subtype_mode_tr_voice">Turkish Voice</string>
-    <!-- Description for Chinese (China, Simplified) voice input subtype [CHAR LIMIT=35] -->
-    <string name="subtype_mode_zh_CN_voice">Chinese (China, Simplified) Voice</string>
-    <!-- Description for Chinese (Taiwan, Traditional) voice input subtype [CHAR LIMIT=35] -->
-    <string name="subtype_mode_zh_TW_voice">Chinese (Taiwan, Traditional) Voice</string>
+    <!-- Description for Chinese, Yue voice input subtype [CHAR LIMIT=35] -->
+    <string name="subtype_mode_yue_voice">Chinese, Yue Voice</string>
+    <!-- Description for Chinese, Mandarin voice input subtype [CHAR LIMIT=35] -->
+    <string name="subtype_mode_zh_voice">Chinese, Mandarin Voice</string>
+    <!-- Description for isiZulu voice input subtype [CHAR LIMIT=35] -->
+    <string name="subtype_mode_zu_voice">isiZulu Voice</string>
 
     <!-- Title of an option for usability study mode -->
     <string name="prefs_usability_study_mode">Usability Study Mode</string>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index f62b6df5a..3bff3fccd 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,8 +20,8 @@
 <!-- The attributes in this XML file provide configuration information -->
 <!-- for the Input Method Manager. -->
 
-<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, fr_CH, it, nb, nl, sr, sv -->
-<!-- Voice: cs, da, de, en_AU, en_GB, en_IN, en_NZ, en_US, es, fr, it, ko, nl, ja, pl, pt, ru, tr, zh_CN, zh_TW -->
+<!-- Keyboard: en_US, en_GB, cs, da, de, es, es_US, fr, fr_CA, fr_CH, it, nb, nl, sr, sv -->
+<!-- Voice: af, cs, da, de, en, es, fr, it, ja, ko, nl, pl, pt, ru, tr, yue, zh, zu -->
 <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
 <!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
 <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
@@ -35,11 +35,16 @@
             android:imeSubtypeMode="keyboard"
     />
     <subtype android:icon="@drawable/ic_subtype_mic"
-            android:label="@string/subtype_mode_en_US_voice"
-            android:imeSubtypeLocale="en_US"
+            android:label="@string/subtype_mode_en_voice"
+            android:imeSubtypeLocale="en"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
+            android:label="@string/subtype_mode_en_GB_keyboard"
+            android:imeSubtypeLocale="en_GB"
+            android:imeSubtypeMode="keyboard"
+    />
     <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_cs_keyboard"
             android:imeSubtypeLocale="cs"
@@ -67,35 +72,6 @@
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_en_GB_keyboard"
-            android:imeSubtypeLocale="en_GB"
-            android:imeSubtypeMode="keyboard"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:label="@string/subtype_mode_en_GB_voice"
-            android:imeSubtypeLocale="en_GB"
-            android:imeSubtypeMode="voice"
-            android:imeSubtypeExtraValue="excludeFromLastInputMethod"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:label="@string/subtype_mode_en_AU_voice"
-            android:imeSubtypeLocale="en_AU"
-            android:imeSubtypeMode="voice"
-            android:imeSubtypeExtraValue="excludeFromLastInputMethod"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:label="@string/subtype_mode_en_IN_voice"
-            android:imeSubtypeLocale="en_IN"
-            android:imeSubtypeMode="voice"
-            android:imeSubtypeExtraValue="excludeFromLastInputMethod"
-    />
-    <subtype android:icon="@drawable/ic_subtype_mic"
-            android:label="@string/subtype_mode_en_NZ_voice"
-            android:imeSubtypeLocale="en_NZ"
-            android:imeSubtypeMode="voice"
-            android:imeSubtypeExtraValue="excludeFromLastInputMethod"
-    />
     <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_es_keyboard"
             android:imeSubtypeLocale="es"
@@ -107,11 +83,6 @@
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
-            android:label="@string/subtype_mode_es_US_keyboard"
-            android:imeSubtypeLocale="es_US"
-            android:imeSubtypeMode="keyboard"
-    />
     <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_mode_fr_keyboard"
             android:imeSubtypeLocale="fr"
@@ -176,8 +147,8 @@
             android:imeSubtypeMode="keyboard"
     />
     <subtype android:icon="@drawable/ic_subtype_mic"
-            android:label="@string/subtype_mode_ko_voice"
-            android:imeSubtypeLocale="ko"
+            android:label="@string/subtype_mode_af_voice"
+            android:imeSubtypeLocale="af"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
@@ -187,6 +158,12 @@
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
+    <subtype android:icon="@drawable/ic_subtype_mic"
+            android:label="@string/subtype_mode_ko_voice"
+            android:imeSubtypeLocale="ko"
+            android:imeSubtypeMode="voice"
+            android:imeSubtypeExtraValue="excludeFromLastInputMethod"
+    />
     <subtype android:icon="@drawable/ic_subtype_mic"
             android:label="@string/subtype_mode_pl_voice"
             android:imeSubtypeLocale="pl"
@@ -212,14 +189,20 @@
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
     <subtype android:icon="@drawable/ic_subtype_mic"
-            android:label="@string/subtype_mode_zh_CN_voice"
-            android:imeSubtypeLocale="zh_CN"
+            android:label="@string/subtype_mode_yue_voice"
+            android:imeSubtypeLocale="yue"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />
     <subtype android:icon="@drawable/ic_subtype_mic"
-            android:label="@string/subtype_mode_zh_TW_voice"
-            android:imeSubtypeLocale="zh_TW"
+            android:label="@string/subtype_mode_zh_voice"
+            android:imeSubtypeLocale="zh"
+            android:imeSubtypeMode="voice"
+            android:imeSubtypeExtraValue="excludeFromLastInputMethod"
+    />
+    <subtype android:icon="@drawable/ic_subtype_mic"
+            android:label="@string/subtype_mode_zu_voice"
+            android:imeSubtypeLocale="zu"
             android:imeSubtypeMode="voice"
             android:imeSubtypeExtraValue="excludeFromLastInputMethod"
     />