diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
index d7a3ef7..108f90a 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -74,7 +74,7 @@
         /*   7:21 */ "more_keys_for_c",
         /*   8:20 */ "more_keys_for_s",
         /*   9:20 */ "more_keys_for_n",
-        /*  10:19 */ "label_to_alpha_key",
+        /*  10:20 */ "label_to_alpha_key",
         /*  11:15 */ "more_keys_for_y",
         /*  12:13 */ "more_keys_for_d",
         /*  13:12 */ "more_keys_for_z",
@@ -1787,8 +1787,15 @@
     /* Language hy_AM: Armenian (Armenia) */
     private static final String[] LANGUAGE_hy_AM = {
         /* more_keys_for_a ~ */
+        null, null, null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_n */
+        // Label for "switch to alphabetic" key.
+        // U+0531: "Ա" ARMENIAN CAPITAL LETTER AYB
+        // U+0532: "Բ" ARMENIAN CAPITAL LETTER BEN
+        // U+0533: "Գ" ARMENIAN CAPITAL LETTER GIM
+        /* label_to_alpha_key */ "\u0531\u0532\u0533",
+        /* more_keys_for_y ~ */
         null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-        null, null, null, null, null, null, null, null, null, null, null,
         /* ~ more_keys_for_cyrillic_ie */
         // U+058A: "֊" ARMENIAN HYPHEN
         // U+055C: "՜" ARMENIAN EXCLAMATION MARK
@@ -3553,7 +3560,7 @@
         "hi", LANGUAGE_hi,    /*  24/ 57 Hindi */
         "hr", LANGUAGE_hr,    /*   9/ 16 Croatian */
         "hu", LANGUAGE_hu,    /*   9/ 16 Hungarian */
-        "hy", LANGUAGE_hy_AM, /*   7/109 Armenian (Armenia) */
+        "hy", LANGUAGE_hy_AM, /*   8/109 Armenian (Armenia) */
         "is", LANGUAGE_is,    /*  13/ 25 Icelandic */
         "it", LANGUAGE_it,    /*   5/  5 Italian */
         "iw", LANGUAGE_iw,    /*  14/106 Hebrew */
diff --git a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
index 73fe927..a17dc10 100644
--- a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
@@ -18,6 +18,11 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Label for "switch to alphabetic" key.
+         U+0531: "Ա" ARMENIAN CAPITAL LETTER AYB
+         U+0532: "Բ" ARMENIAN CAPITAL LETTER BEN
+         U+0533: "Գ" ARMENIAN CAPITAL LETTER GIM -->
+    <string name="label_to_alpha_key">&#x0531;&#x0532;&#x0533;</string>
     <!-- U+058A: "֊" ARMENIAN HYPHEN -->
     <!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK -->
     <!-- U+055D: "՝" ARMENIAN COMMA -->