diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 35926a0..b493a0f 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -25,10 +25,14 @@
             android:fragment="com.android.settings.LocalePicker"
             />
 
-    <com.android.settings.inputmethod.SpellCheckersPreference
+    <!-- Spell checker preference title, summary and fragment will be set programmatically. -->
+    <!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.
+         See: InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference. -->
+    <PreferenceScreen
             android:key="spellcheckers_settings"
             android:title="@string/spellcheckers_settings_title"
             settings:keywords="@string/keywords_spell_checker"
+            android:persistent="false"
             />
 
     <!-- User dictionary preference title and fragment will be set programmatically. -->
diff --git a/res/xml/spellchecker_prefs.xml b/res/xml/spellchecker_prefs.xml
index 1de0493..666b0a9 100644
--- a/res/xml/spellchecker_prefs.xml
+++ b/res/xml/spellchecker_prefs.xml
@@ -14,7 +14,11 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/spellcheckers_settings_title">
-
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/spellcheckers_settings_title">
+    <Preference
+        android:key="spellchecker_language"
+        android:title="@string/phone_language"
+        android:persistent="false" />
 </PreferenceScreen>