diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
index eb494275f..f18ebd1fe 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -2299,10 +2299,10 @@ public final class KeyboardTextsTable {
         null, null, null, null, null,
         /* ~ morekeys_i */
         // Label for "switch to alphabetic" key.
-        // U+0C95: "ಕ" KANNADA LETTER KA
-        // U+0CA8/U+0CCD/U+0CA8: "ನ್ನ" KANNADA LETTER NA/KANNADA SIGN VIRAMA/KANNADA LETTER NA
-        // U+0CA1: "ಡ" KANNADA LETTER DDA
-        /* keylabel_to_alpha */ "\u0C95\u0CA8\u0CCD\u0CA8\u0CA1",
+        // U+0C85: "ಅ" KANNADA LETTER A
+        // U+0C86: "ಆ" KANNADA LETTER AA
+        // U+0C87: "ಇ" KANNADA LETTER I
+        /* keylabel_to_alpha */ "\u0C85\u0C86\u0C87",
         /* morekeys_c ~ */
         null, null, null, null, null,
         /* ~ morekeys_s */
@@ -3434,10 +3434,10 @@ public final class KeyboardTextsTable {
         null, null, null, null, null,
         /* ~ morekeys_i */
         // Label for "switch to alphabetic" key.
-        // U+0C24/U+0C46: "తె" TELUGU LETTER TA/TELUGU VOWEL SIGN E
-        // U+0C32/U+0C41: "లు" TELUGU LETTER LA/TELUGU VOWEL SIGN U
-        // U+0C17/U+0C41: "గు" TELUGU LETTER GA/TELUGU VOWEL SIGN U
-        /* keylabel_to_alpha */ "\u0C24\u0C46\u0C32\u0C41\u0C17\u0C41",
+        // U+0C05: "అ" TELUGU LETTER A
+        // U+0C06: "ఆ" TELUGU LETTER AA
+        // U+0C07: "ఇ" TELUGU LETTER I
+        /* keylabel_to_alpha */ "\u0C05\u0C06\u0C07",
         /* morekeys_c ~ */
         null, null, null, null, null,
         /* ~ morekeys_s */
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java b/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java
index c87e304a4..5ce7f4d9c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java
@@ -64,11 +64,11 @@ public final class Kannada extends LayoutBase {
             return joinKeys(LANGUAGE_SWITCH_KEY, SPACE_KEY, key(ZWNJ_KEY, ZWJ_KEY));
         }
 
-        // U+0C95: "ಕ" KANNADA LETTER KA
-        // U+0CA8/U+0CCD/U+0CA8: "ನ್ನ" KANNADA LETTER NA/KANNADA SIGN VIRAMA/KANNADA LETTER NA
-        // U+0CA1: "ಡ" KANNADA LETTER DDA
+        // U+0C85: "ಅ" KANNADA LETTER A
+        // U+0C86: "ಆ" KANNADA LETTER AA
+        // U+0C87: "ಇ" KANNADA LETTER I
         private static final ExpectedKey KANNADA_ALPHABET_KEY = key(
-                "\u0C95\u0CA8\u0CCD\u0CA8\u0CA1", Constants.CODE_SWITCH_ALPHA_SYMBOL);
+                "\u0C85\u0C86\u0C87", Constants.CODE_SWITCH_ALPHA_SYMBOL);
 
         // U+20B9: "₹" INDIAN RUPEE SIGN
         private static final ExpectedKey CURRENCY_RUPEE = key("\u20B9",
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Telugu.java b/tests/src/com/android/inputmethod/keyboard/layout/Telugu.java
index f5d8d4148..cc8224c54 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Telugu.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Telugu.java
@@ -64,11 +64,11 @@ public final class Telugu extends LayoutBase {
             return joinKeys(LANGUAGE_SWITCH_KEY, SPACE_KEY, key(ZWNJ_KEY, ZWJ_KEY));
         }
 
-        // U+0C24/U+0C46: "తె" TELUGU LETTER TA/TELUGU VOWEL SIGN E
-        // U+0C32/U+0C41: "లు" TELUGU LETTER LA/TELUGU VOWEL SIGN U
-        // U+0C17/U+0C41: "గు" TELUGU LETTER GA/TELUGU VOWEL SIGN U
+        // U+0C05: "అ" TELUGU LETTER A
+        // U+0C06: "ఆ" TELUGU LETTER AA
+        // U+0C07: "ఇ" TELUGU LETTER I
         private static final ExpectedKey TELUGU_ALPHABET_KEY = key(
-                "\u0C24\u0C46\u0C32\u0C41\u0C17\u0C41", Constants.CODE_SWITCH_ALPHA_SYMBOL);
+                "\u0C05\u0C06\u0C07", Constants.CODE_SWITCH_ALPHA_SYMBOL);
 
         // U+20B9: "₹" INDIAN RUPEE SIGN
         private static final ExpectedKey CURRENCY_RUPEE = key("\u20B9",
diff --git a/tools/make-keyboard-text/res/values-kn-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-kn-rIN/donottranslate-more-keys.xml
index 88c822683..54b267462 100644
--- a/tools/make-keyboard-text/res/values-kn-rIN/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-kn-rIN/donottranslate-more-keys.xml
@@ -19,10 +19,10 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Label for "switch to alphabetic" key.
-         U+0C95: "ಕ" KANNADA LETTER KA
-         U+0CA8/U+0CCD/U+0CA8: "ನ್ನ" KANNADA LETTER NA/KANNADA SIGN VIRAMA/KANNADA LETTER NA
-         U+0CA1: "ಡ" KANNADA LETTER DDA -->
-    <string name="keylabel_to_alpha">&#x0C95;&#x0CA8;&#x0CCD;&#x0CA8;&#x0CA1;</string>
+         U+0C85: "ಅ" KANNADA LETTER A
+         U+0C86: "ಆ" KANNADA LETTER AA
+         U+0C87: "ಇ" KANNADA LETTER I -->
+    <string name="keylabel_to_alpha">&#x0C85;&#x0C86;&#x0C87;</string>
     <!-- U+20B9: "₹" INDIAN RUPEE SIGN -->
     <string name="keyspec_currency">&#x20B9;</string>
 </resources>
diff --git a/tools/make-keyboard-text/res/values-te-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-te-rIN/donottranslate-more-keys.xml
index 7fa769d06..6518dea8f 100644
--- a/tools/make-keyboard-text/res/values-te-rIN/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-te-rIN/donottranslate-more-keys.xml
@@ -19,10 +19,10 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Label for "switch to alphabetic" key.
-         U+0C24/U+0C46: "తె" TELUGU LETTER TA/TELUGU VOWEL SIGN E
-         U+0C32/U+0C41: "లు" TELUGU LETTER LA/TELUGU VOWEL SIGN U
-         U+0C17/U+0C41: "గు" TELUGU LETTER GA/TELUGU VOWEL SIGN U -->
-    <string name="keylabel_to_alpha">&#x0C24;&#x0C46;&#x0C32;&#x0C41;&#x0C17;&#x0C41;</string>
+         U+0C05: "అ" TELUGU LETTER A
+         U+0C06: "ఆ" TELUGU LETTER AA
+         U+0C07: "ఇ" TELUGU LETTER I -->
+    <string name="keylabel_to_alpha">&#x0C05;&#x0C06;&#x0C07;</string>
     <!-- U+20B9: "₹" INDIAN RUPEE SIGN -->
     <string name="keyspec_currency">&#x20B9;</string>
 </resources>