diff -u xkeyboard-config-2.19/debian/changelog xkeyboard-config-2.19/debian/changelog
--- xkeyboard-config-2.19/debian/changelog
+++ xkeyboard-config-2.19/debian/changelog
@@ -1,3 +1,21 @@
+xkeyboard-config (2.19-1.1ubuntu1) artful; urgency=medium
+
+  * Merge with Debian (LP: #1707929), remaining changes:
+    - control, rules, xkb-data-i18n.install, xkb-data.install: Split out
+      xkb-data-i18n to be used by console-setup.
+    - xkb-data.postinst: Remove the xkb cache to make sure it gets
+      regenerated.
+    - debian/patches/elfdalian-kb-layout.diff
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Mon, 02 Oct 2017 21:46:00 +0200
+
+xkeyboard-config (2.19-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Revert blacklisting of Indic layouts (Closes: #865316)
+
+ -- Pirate Praveen <praveen@debian.org>  Tue, 18 Jul 2017 13:08:55 +0530
+
 xkeyboard-config (2.19-1ubuntu1) zesty; urgency=medium
 
   * Merge with Debian, remaining changes:
diff -u xkeyboard-config-2.19/debian/patches/series xkeyboard-config-2.19/debian/patches/series
--- xkeyboard-config-2.19/debian/patches/series
+++ xkeyboard-config-2.19/debian/patches/series
@@ -2,2 +2,3 @@
 revert-goodmap-badmap-for-apple.diff
+revert-indic-blacklist.diff
 elfdalian-kb-layout.diff
only in patch2:
unchanged:
--- xkeyboard-config-2.19.orig/debian/patches/revert-indic-blacklist.diff
+++ xkeyboard-config-2.19/debian/patches/revert-indic-blacklist.diff
@@ -0,0 +1,756 @@
+From bba001a451ae79a983b3ecac40ff86c4121c83c8 Mon Sep 17 00:00:00 2001
+From: Akshay S Dinesh <asdofindia@gmail.com>
+Date: Wed, 21 Jun 2017 18:19:18 +0530
+Subject: Whitelist Indian keyboard layouts. #101532
+
+Indian keyboard layouts were moved into extras in #96418.
+This was not necessary as it was indeed possible to type complex
+characters of Indian scripts using these layouts.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101532
+
+Signed-off-by: Akshay S Dinesh <asdofindia@gmail.com>
+
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -1805,6 +1805,27 @@
+     </layout>
+     <layout>
+       <configItem>
++        <name>bd</name>
++        <!-- Keyboard indicator for Bangla layouts -->
++        <_shortDescription>bn</_shortDescription>
++        <_description>Bangla</_description>
++        <languageList>
++          <iso639Id>ben</iso639Id>
++          <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
++          <iso639Id>sat</iso639Id>
++        </languageList>
++      </configItem>
++      <variantList>
++        <variant>
++          <configItem>
++            <name>probhat</name>
++            <_description>Bangla (Probhat)</_description>
++          </configItem>
++        </variant>
++      </variantList>
++    </layout>
++    <layout>
++      <configItem>
+         <name>in</name>
+         <!-- Keyboard indicator for Indian layouts -->
+         <_shortDescription>in</_shortDescription>
+@@ -1813,6 +1834,286 @@
+       <variantList>
+         <variant>
+           <configItem>
++            <name>ben</name>
++            <!-- Keyboard indicator for Bangla layouts -->
++            <_shortDescription>bn</_shortDescription>
++            <_description>Bangla (India)</_description>
++            <languageList>
++              <iso639Id>ben</iso639Id>
++              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
++              <iso639Id>sat</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>ben_probhat</name>
++            <!-- Keyboard indicator for Bangla layouts -->
++            <_shortDescription>bn</_shortDescription>
++            <_description>Bangla (India, Probhat)</_description>
++            <languageList>
++              <iso639Id>ben</iso639Id>
++              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
++              <iso639Id>sat</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>ben_baishakhi</name>
++            <_description>Bangla (India, Baishakhi)</_description>
++            <languageList>
++              <iso639Id>ben</iso639Id>
++              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
++              <iso639Id>sat</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>ben_bornona</name>
++            <_description>Bangla (India, Bornona)</_description>
++            <languageList>
++              <iso639Id>ben</iso639Id>
++              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
++              <iso639Id>sat</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++         <variant>
++          <configItem>
++            <name>ben_gitanjali</name>
++            <_description>Bangla (India, Uni Gitanjali)</_description>
++            <languageList>
++              <iso639Id>ben</iso639Id>
++              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
++              <iso639Id>sat</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>ben_inscript</name>
++            <_description>Bangla (India, Baishakhi Inscript)</_description>
++            <languageList>
++              <iso639Id>ben</iso639Id>
++              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
++              <iso639Id>sat</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>eeyek</name>
++            <_description>Manipuri (Eeyek)</_description>
++            <languageList>
++              <iso639Id>mni</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>guj</name>
++            <!-- Keyboard indicator for Gujarati layouts -->
++            <_shortDescription>gu</_shortDescription>
++            <_description>Gujarati</_description>
++            <languageList>
++              <iso639Id>guj</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>guru</name>
++            <!-- Keyboard indicator for Punjabi layouts -->
++            <_shortDescription>pa</_shortDescription>
++            <_description>Punjabi (Gurmukhi)</_description>
++            <languageList>
++              <iso639Id>pan</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>jhelum</name>
++            <!-- Keyboard indicator for Punjabi layouts -->
++            <_shortDescription>pa</_shortDescription>
++            <_description>Punjabi (Gurmukhi Jhelum)</_description>
++            <languageList>
++              <iso639Id>pan</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>kan</name>
++            <!-- Keyboard indicator for Kannada layouts -->
++            <_shortDescription>kn</_shortDescription>
++            <_description>Kannada</_description>
++            <languageList>
++              <iso639Id>kan</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>kan-kagapa</name>
++            <!-- Keyboard indicator for Kannada layouts -->
++            <_shortDescription>kn</_shortDescription>
++            <_description>Kannada (KaGaPa phonetic)</_description>
++            <languageList>
++              <iso639Id>kan</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>mal</name>
++            <!-- Keyboard indicator for Malayalam layouts -->
++            <_shortDescription>ml</_shortDescription>
++            <_description>Malayalam</_description>
++            <languageList>
++              <iso639Id>mal</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>mal_lalitha</name>
++            <!-- Keyboard indicator for Malayalam layouts -->
++            <_shortDescription>ml</_shortDescription>
++            <_description>Malayalam (Lalitha)</_description>
++            <languageList>
++              <iso639Id>mal</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>mal_enhanced</name>
++            <!-- Keyboard indicator for Malayalam layouts -->
++            <_shortDescription>ml</_shortDescription>
++            <_description>Malayalam (enhanced Inscript, with rupee)</_description>
++            <languageList>
++              <iso639Id>mal</iso639Id>
++            </languageList>
++          </configItem>
++         </variant>
++         <variant>
++           <configItem>
++            <name>ori</name>
++            <!-- Keyboard indicator for Oriya layouts -->
++            <_shortDescription>or</_shortDescription>
++            <_description>Oriya</_description>
++            <languageList>
++              <iso639Id>ori</iso639Id>
++              <!-- sat-Orya: http://www.ethnologue.com/language/sat -->
++              <iso639Id>sat</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++           <configItem>
++            <name>olck</name>
++            <!-- Keyboard indicator for Ol Chiki layouts -->
++            <_shortDescription>sat</_shortDescription>
++            <_description>Ol Chiki</_description>
++            <languageList>
++              <!-- sat-Olck: http://www.ethnologue.com/language/sat -->
++              <iso639Id>sat</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>tam_unicode</name>
++            <!-- Keyboard indicator for Tamil layouts -->
++            <_shortDescription>ta</_shortDescription>
++            <_description>Tamil (Unicode)</_description>
++            <languageList>
++              <iso639Id>tam</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>tam_keyboard_with_numerals</name>
++            <!-- Keyboard indicator for Tamil layouts -->
++            <_shortDescription>ta</_shortDescription>
++            <_description>Tamil (keyboard with numerals)</_description>
++            <languageList>
++              <iso639Id>tam</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>tam_TAB</name>
++            <!-- Keyboard indicator for Tamil layouts -->
++            <_shortDescription>ta</_shortDescription>
++            <_description>Tamil (TAB typewriter)</_description>
++            <languageList>
++              <iso639Id>tam</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>tam_TSCII</name>
++            <!-- Keyboard indicator for Tamil layouts -->
++            <_shortDescription>ta</_shortDescription>
++            <_description>Tamil (TSCII typewriter)</_description>
++            <languageList>
++              <iso639Id>tam</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>tam</name>
++            <!-- Keyboard indicator for Tamil layouts -->
++            <_shortDescription>ta</_shortDescription>
++            <_description>Tamil</_description>
++            <languageList>
++              <iso639Id>tam</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>tel</name>
++            <!-- Keyboard indicator for Telugu layouts -->
++            <_shortDescription>te</_shortDescription>
++            <_description>Telugu</_description>
++            <languageList>
++              <iso639Id>tel</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>tel-kagapa</name>
++            <!-- Keyboard indicator for Telugu layouts -->
++            <_shortDescription>te</_shortDescription>
++            <_description>Telugu (KaGaPa phonetic)</_description>
++            <languageList>
++              <iso639Id>tel</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>tel-sarala</name>
++            <!-- Keyboard indicator for Telugu layouts -->
++            <_shortDescription>te</_shortDescription>
++            <_description>Telugu (Sarala)</_description>
++            <languageList>
++              <iso639Id>tel</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
+             <name>urd-phonetic</name>
+             <!-- Keyboard indicator for Urdu layouts -->
+             <_shortDescription>ur</_shortDescription>
+@@ -1844,6 +2145,61 @@
+             </languageList>
+           </configItem>
+         </variant>
++        <variant>
++          <configItem>
++            <name>bolnagri</name>
++            <!-- Keyboard indicator for Hindi layouts -->
++            <_shortDescription>hi</_shortDescription>
++            <_description>Hindi (Bolnagri)</_description>
++            <languageList>
++              <iso639Id>hin</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>hin-wx</name>
++            <!-- Keyboard indicator for Hindi layouts -->
++            <_shortDescription>hi</_shortDescription>
++            <_description>Hindi (Wx)</_description>
++            <languageList>
++              <iso639Id>hin</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>hin-kagapa</name>
++            <!-- Keyboard indicator for Hindi layouts -->
++            <_shortDescription>hi</_shortDescription>
++            <_description>Hindi (KaGaPa phonetic)</_description>
++            <languageList>
++              <iso639Id>hin</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>san-kagapa</name>
++            <!-- Keyboard indicator for Sanskrit layouts -->
++            <_shortDescription>sa</_shortDescription>
++            <_description>Sanskrit (KaGaPa phonetic)</_description>
++            <languageList>
++              <iso639Id>san</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++            <name>mar-kagapa</name>
++            <!-- Keyboard indicator for Marathi layouts -->
++            <_shortDescription>mr</_shortDescription>
++            <_description>Marathi (KaGaPa phonetic)</_description>
++            <languageList>
++              <iso639Id>mar</iso639Id>
++            </languageList>
++          </configItem>
++        </variant>
+         <variant>
+           <configItem>
+             <name>eng</name>
+--- a/rules/base.extras.xml.in
++++ b/rules/base.extras.xml.in
+@@ -948,361 +948,6 @@
+         </variant>
+       </variantList>
+     </layout>
+-    <layout>
+-      <configItem>
+-        <name>bd</name>
+-        <!-- Keyboard indicator for Bangla layouts -->
+-        <_shortDescription>bn</_shortDescription>
+-        <_description>Bangla</_description>
+-        <languageList>
+-          <iso639Id>ben</iso639Id>
+-          <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+-          <iso639Id>sat</iso639Id>
+-        </languageList>
+-      </configItem>
+-      <variantList>
+-        <variant>
+-          <configItem>
+-            <name>probhat</name>
+-            <_description>Bangla (Probhat)</_description>
+-          </configItem>
+-        </variant>
+-      </variantList>
+-    </layout>
+-    <layout>
+-      <configItem>
+-        <name>in</name>
+-        <!-- Keyboard indicator for Indian layouts -->
+-        <_shortDescription>in</_shortDescription>
+-        <_description>Indian</_description>
+-      </configItem>
+-      <variantList>
+-        <variant>
+-          <configItem>
+-            <name>ben</name>
+-            <!-- Keyboard indicator for Bangla layouts -->
+-            <_shortDescription>bn</_shortDescription>
+-            <_description>Bangla (India)</_description>
+-            <languageList>
+-              <iso639Id>ben</iso639Id>
+-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+-              <iso639Id>sat</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>ben_probhat</name>
+-            <!-- Keyboard indicator for Bangla layouts -->
+-            <_shortDescription>bn</_shortDescription>
+-            <_description>Bangla (India, Probhat)</_description>
+-            <languageList>
+-              <iso639Id>ben</iso639Id>
+-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+-              <iso639Id>sat</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>ben_baishakhi</name>
+-            <_description>Bangla (India, Baishakhi)</_description>
+-            <languageList>
+-              <iso639Id>ben</iso639Id>
+-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+-              <iso639Id>sat</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>ben_bornona</name>
+-            <_description>Bangla (India, Bornona)</_description>
+-            <languageList>
+-              <iso639Id>ben</iso639Id>
+-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+-              <iso639Id>sat</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-         <variant>
+-          <configItem>
+-            <name>ben_gitanjali</name>
+-            <_description>Bangla (India, Uni Gitanjali)</_description>
+-            <languageList>
+-              <iso639Id>ben</iso639Id>
+-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+-              <iso639Id>sat</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>ben_inscript</name>
+-            <_description>Bangla (India, Baishakhi Inscript)</_description>
+-            <languageList>
+-              <iso639Id>ben</iso639Id>
+-              <!-- sat-Beng: http://www.ethnologue.com/language/sat -->
+-              <iso639Id>sat</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>eeyek</name>
+-            <_description>Manipuri (Eeyek)</_description>
+-            <languageList>
+-              <iso639Id>mni</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>guj</name>
+-            <!-- Keyboard indicator for Gujarati layouts -->
+-            <_shortDescription>gu</_shortDescription>
+-            <_description>Gujarati</_description>
+-            <languageList>
+-              <iso639Id>guj</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>guru</name>
+-            <!-- Keyboard indicator for Punjabi layouts -->
+-            <_shortDescription>pa</_shortDescription>
+-            <_description>Punjabi (Gurmukhi)</_description>
+-            <languageList>
+-              <iso639Id>pan</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>jhelum</name>
+-            <!-- Keyboard indicator for Punjabi layouts -->
+-            <_shortDescription>pa</_shortDescription>
+-            <_description>Punjabi (Gurmukhi Jhelum)</_description>
+-            <languageList>
+-              <iso639Id>pan</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>kan</name>
+-            <!-- Keyboard indicator for Kannada layouts -->
+-            <_shortDescription>kn</_shortDescription>
+-            <_description>Kannada</_description>
+-            <languageList>
+-              <iso639Id>kan</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>kan-kagapa</name>
+-            <!-- Keyboard indicator for Kannada layouts -->
+-            <_shortDescription>kn</_shortDescription>
+-            <_description>Kannada (KaGaPa phonetic)</_description>
+-            <languageList>
+-              <iso639Id>kan</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>mal</name>
+-            <!-- Keyboard indicator for Malayalam layouts -->
+-            <_shortDescription>ml</_shortDescription>
+-            <_description>Malayalam</_description>
+-            <languageList>
+-              <iso639Id>mal</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>mal_lalitha</name>
+-            <!-- Keyboard indicator for Malayalam layouts -->
+-            <_shortDescription>ml</_shortDescription>
+-            <_description>Malayalam (Lalitha)</_description>
+-            <languageList>
+-              <iso639Id>mal</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>mal_enhanced</name>
+-            <!-- Keyboard indicator for Malayalam layouts -->
+-            <_shortDescription>ml</_shortDescription>
+-            <_description>Malayalam (enhanced Inscript, with rupee sign)</_description>
+-            <languageList>
+-              <iso639Id>mal</iso639Id>
+-            </languageList>
+-          </configItem>
+-         </variant>
+-         <variant>
+-           <configItem>
+-            <name>ori</name>
+-            <!-- Keyboard indicator for Oriya layouts -->
+-            <_shortDescription>or</_shortDescription>
+-            <_description>Oriya</_description>
+-            <languageList>
+-              <iso639Id>ori</iso639Id>
+-              <!-- sat-Orya: http://www.ethnologue.com/language/sat -->
+-              <iso639Id>sat</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-           <configItem>
+-            <name>olck</name>
+-            <!-- Keyboard indicator for Ol Chiki layouts -->
+-            <_shortDescription>sat</_shortDescription>
+-            <_description>Ol Chiki</_description>
+-            <languageList>
+-              <!-- sat-Olck: http://www.ethnologue.com/language/sat -->
+-              <iso639Id>sat</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>tam_unicode</name>
+-            <!-- Keyboard indicator for Tamil layouts -->
+-            <_shortDescription>ta</_shortDescription>
+-            <_description>Tamil (Unicode)</_description>
+-            <languageList>
+-              <iso639Id>tam</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>tam_keyboard_with_numerals</name>
+-            <!-- Keyboard indicator for Tamil layouts -->
+-            <_shortDescription>ta</_shortDescription>
+-            <_description>Tamil (keyboard with numerals)</_description>
+-            <languageList>
+-              <iso639Id>tam</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>tam_TAB</name>
+-            <!-- Keyboard indicator for Tamil layouts -->
+-            <_shortDescription>ta</_shortDescription>
+-            <_description>Tamil (TAB typewriter)</_description>
+-            <languageList>
+-              <iso639Id>tam</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>tam_TSCII</name>
+-            <!-- Keyboard indicator for Tamil layouts -->
+-            <_shortDescription>ta</_shortDescription>
+-            <_description>Tamil (TSCII typewriter)</_description>
+-            <languageList>
+-              <iso639Id>tam</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>tam</name>
+-            <!-- Keyboard indicator for Tamil layouts -->
+-            <_shortDescription>ta</_shortDescription>
+-            <_description>Tamil</_description>
+-            <languageList>
+-              <iso639Id>tam</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>tel</name>
+-            <!-- Keyboard indicator for Telugu layouts -->
+-            <_shortDescription>te</_shortDescription>
+-            <_description>Telugu</_description>
+-            <languageList>
+-              <iso639Id>tel</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>tel-kagapa</name>
+-            <!-- Keyboard indicator for Telugu layouts -->
+-            <_shortDescription>te</_shortDescription>
+-            <_description>Telugu (KaGaPa phonetic)</_description>
+-            <languageList>
+-              <iso639Id>tel</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>bolnagri</name>
+-            <!-- Keyboard indicator for Hindi layouts -->
+-            <_shortDescription>hi</_shortDescription>
+-            <_description>Hindi (Bolnagri)</_description>
+-            <languageList>
+-              <iso639Id>hin</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>hin-wx</name>
+-            <!-- Keyboard indicator for Hindi layouts -->
+-            <_shortDescription>hi</_shortDescription>
+-            <_description>Hindi (Wx)</_description>
+-            <languageList>
+-              <iso639Id>hin</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>hin-kagapa</name>
+-            <!-- Keyboard indicator for Hindi layouts -->
+-            <_shortDescription>hi</_shortDescription>
+-            <_description>Hindi (KaGaPa phonetic)</_description>
+-            <languageList>
+-              <iso639Id>hin</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>san-kagapa</name>
+-            <!-- Keyboard indicator for Sanskrit layouts -->
+-            <_shortDescription>sa</_shortDescription>
+-            <_description>Sanskrit (KaGaPa phonetic)</_description>
+-            <languageList>
+-              <iso639Id>san</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+-            <name>mar-kagapa</name>
+-            <!-- Keyboard indicator for Marathi layouts -->
+-            <_shortDescription>mr</_shortDescription>
+-            <_description>Marathi (KaGaPa phonetic)</_description>
+-            <languageList>
+-              <iso639Id>mar</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+-      </variantList>
+-    </layout>
+   </layoutList>
+   <optionList>
+       <group allowMultipleSelection="true">