diff --git a/res/values/strings.xml b/res/values/strings.xml
index db6ebc68ef4..b8b4672039f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6996,6 +6996,10 @@
     <string name="keywords_sim_status">network, mobile network state, service state, signal strength, mobile network type, roaming, iccid</string>
     <string name="keywords_model_and_hardware">serial number, hardware version</string>
     <string name="keywords_android_version">android security patch level, baseband version, kernel version</string>
+
+    <!-- Search keyword for Send Device Feedback Setting [CHAR LIMIT=NONE] -->
+    <string name="keywords_device_feedback">bug</string>
+
     <!-- Search keyword for Ambient display settings screen. -->
     <string name="keywords_ambient_display_screen">Ambient display, Lock screen display</string>
     <!-- Search keyword for fingerprint settings. -->
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 634831633ef..b70b613eb7a 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -153,7 +153,8 @@
     <Preference
         android:key="device_feedback"
         android:order="41"
-        android:title="@string/device_feedback"/>
+        android:title="@string/device_feedback"
+        settings:keywords="@string/keywords_device_feedback" />
 
     <!-- Device FCC equipment id -->
     <Preference