diff --git a/res/values/strings.xml b/res/values/strings.xml
index 190cb80bfbb..8e29e5ddc64 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1884,7 +1884,7 @@
          Label on Wifi Configuration screen-->
     <string name="config_list_label" translatable="false">Configured networks</string>
 
-    <!-- Wireless networks, item title to go into the WFC settings -->
+    <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
     <string name="wifi_calling_settings_title">Wi-Fi calling</string>
     <!-- WFC mode [CHAR LIMIT=30] -->
     <string name="wifi_calling_mode_title">Wi-Fi calling mode</string>
@@ -5637,6 +5637,7 @@
     <string name="keywords_wifi">wifi wi-fi network connection</string>
     <string name="keywords_more_default_sms_app">text message texting messages messaging</string>
     <string name="keywords_more_mobile_networks">cellular cell carrier wireless data 4g 3g 2g lte</string>
+    <string name="keywords_wifi_calling">wifi wi-fi call calling roaming handoff</string>
     <string name="keywords_home">launcher</string>
     <string name="keywords_display">screen touchscreen</string>
     <string name="keywords_display_brightness_level">dim screen touchscreen battery</string>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index fc3ca16783c..7a4ed9a52aa 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -66,6 +66,7 @@
     <PreferenceScreen
         android:key="wifi_calling_settings"
         android:title="@string/wifi_calling_settings_title"
+        settings:keywords="@string/keywords_wifi_calling"
         android:fragment="com.android.settings.WifiCallingSettings" />
 
     <Preference
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 6b64fdfa72d..2e8fb74793a 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -28,7 +28,6 @@ import android.widget.Switch;
 
 import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
-import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
 
 /**
@@ -38,7 +37,7 @@ import com.android.settings.widget.SwitchBar;
  */
 public class WifiCallingSettings extends SettingsPreferenceFragment
         implements SwitchBar.OnSwitchChangeListener,
-        Preference.OnPreferenceChangeListener, Indexable {
+        Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "WifiCallingSettings";