diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4a82504df37..18dde512393 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10134,11 +10134,11 @@
     <!-- Title for settings suggestion for double twist for camera [CHAR LIMIT=60] -->
     <string name="double_twist_for_camera_suggestion_title">Take selfies faster</string>
 
-    <!-- Title text for system navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
-    <string name="system_navigation_title" translatable="false">System navigation</string>
+    <!-- Title text for system navigation [CHAR LIMIT=60] -->
+    <string name="system_navigation_title">System navigation</string>
 
-    <!-- Title text for swipe up to switch apps [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
-    <string name="swipe_up_to_switch_apps_title" translatable="false">2-button navigation</string>
+    <!-- Title text for swipe up to switch apps [CHAR LIMIT=60] -->
+    <string name="swipe_up_to_switch_apps_title">2-button navigation</string>
     <!-- Summary text for swipe up to switch apps  [CHAR LIMIT=250] -->
     <string name="swipe_up_to_switch_apps_summary">To switch apps, swipe up on the Home button. Swipe up again to see all apps. Works from any screen. You’ll no longer have an Overview button on the bottom right of your screen.</string>
     <!-- Title for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
@@ -10146,15 +10146,18 @@
     <!-- Summary for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
     <string name="swipe_up_to_switch_apps_suggestion_summary">Turn on the new gesture to switch apps</string>
 
-    <!-- Title text for edge to edge navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
-    <string name="edge_to_edge_navigation_title" translatable="false">Fully gestural navigation</string>
-    <!-- Summary text for edge to edge navigation  [CHAR LIMIT=None] [DO NOT TRANSLATE] -->
-    <string name="edge_to_edge_navigation_summary" translatable="false">To go Home, swipe up from the bottom of the screen. To go Back, swipe from either the left or right edge of the screen. To switch apps, start swiping up from the bottom of the screen and hold before releasing.</string>
+    <!-- Title text for edge to edge navigation [CHAR LIMIT=60] -->
+    <string name="edge_to_edge_navigation_title">Gesture navigation</string>
+    <!-- Summary text for edge to edge navigation [CHAR LIMIT=NONE] -->
+    <string name="edge_to_edge_navigation_summary">To go Home, swipe up from the bottom of the screen. To go Back, swipe from either the left or right edge of the screen. To switch apps, start swiping up from the bottom of the screen and hold before releasing.</string>
 
-    <!-- Title text for 3-button navigation [CHAR LIMIT=60] [DO NOT TRANSLATE] -->
-    <string name="legacy_navigation_title" translatable="false">3-button navigation</string>
-    <!-- Summary text for 3-button navigation  [CHAR LIMIT=250] [DO NOT TRANSLATE] -->
-    <string name="legacy_navigation_summary" translatable="false">Classic Android navigation mode where going Home, switching apps, and going Back are accessible via buttons.</string>
+    <!-- Title text for 3-button navigation [CHAR LIMIT=60] -->
+    <string name="legacy_navigation_title">3-button navigation</string>
+    <!-- Summary text for 3-button navigation  [CHAR LIMIT=NONE] -->
+    <string name="legacy_navigation_summary">Classic Android navigation mode where going Home, switching apps, and going Back are accessible via buttons.</string>
+
+    <!-- Search keywords for System Navigation settings. [CHAR_LIMIT=NONE]-->
+    <string name="keywords_system_navigation">system navigation, 2 button navigation, 3 button navigation, gesture navigation</string>
 
     <!-- Preference and settings suggestion title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
     <string name="ambient_display_title" product="default">Double-tap to check phone</string>