diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7695335ceca..a48ff772249 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8051,6 +8051,9 @@
     <string name="keywords_display_cast_screen">project, cast, Screen mirroring, Screen sharing, mirroring, share screen, screen casting</string>
     <string name="keywords_storage">space, disk, hard drive, device usage</string>
     <string name="keywords_battery">power usage, charge</string>
+    <string name="keywords_battery_usage">view battery usage, battery usage, power usage</string>
+    <string name="keywords_battery_saver">battery saver, power saver, saver</string>
+    <string name="keywords_battery_adaptive_preferences">adaptive preferences, adaptive battery</string>
     <string name="keywords_spell_checker">spelling, dictionary, spellcheck, auto-correct</string>
     <string name="keywords_voice_input">recognizer, input, speech, speak, language, hands-free, hand free, recognition, offensive, word, audio, history, bluetooth headset</string>
     <string name="keywords_text_to_speech_output">rate, language, default, speak, speaking, tts, accessibility, screen reader, blind</string>
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 55b2eee5737..e1059206be1 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -17,7 +17,8 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/battery_saver">
+    android:title="@string/battery_saver"
+    settings:keywords="@string/keywords_battery_saver">
 
     <com.android.settingslib.widget.MainSwitchPreference
         android:order="-100"
diff --git a/res/xml/power_usage_advanced.xml b/res/xml/power_usage_advanced.xml
index fc6c0fff883..67f17834c7d 100644
--- a/res/xml/power_usage_advanced.xml
+++ b/res/xml/power_usage_advanced.xml
@@ -19,7 +19,7 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="power_usage_advanced_screen"
     android:title="@string/advanced_battery_title"
-    settings:keywords="@string/keywords_battery">
+    settings:keywords="@string/keywords_battery_usage">
 
     <com.android.settings.fuelgauge.BatteryHistoryPreference
         android:key="battery_graph"/>
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 34c524c69ba..58327c0ec0d 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -42,19 +42,21 @@
         android:fragment="com.android.settings.fuelgauge.PowerUsageAdvanced"
         android:key="battery_usage_summary"
         android:title="@string/advanced_battery_preference_title"
-        settings:searchable="false" />
+        settings:keywords="@string/keywords_battery_usage" />
 
     <Preference
         android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
         android:key="battery_saver_summary"
         android:title="@string/battery_saver"
+        settings:keywords="@string/keywords_battery_saver"
         settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
 
     <Preference
         android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
         android:key="smart_battery_manager"
         android:title="@string/smart_battery_manager_title"
-        settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" />
+        settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"
+        settings:keywords="@string/keywords_battery_adaptive_preferences" />
 
     <SwitchPreference
         android:key="battery_percentage"
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index c2b3d1fd818..c907c482500 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -20,7 +20,7 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="smart_battery_detail"
     android:title="@string/smart_battery_manager_title"
-    settings:searchable="false">
+    settings:keywords="@string/keywords_battery_adaptive_preferences">
 
     <com.android.settings.widget.VideoPreference
         android:key="auto_awesome_battery"