diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index a803be2133..0d5d174228 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -219,10 +219,10 @@
     <string name="allset_hint">Swipe up to go home</string>
     <!-- Hint string at the bottom of "All Set" page for button navigation [CHAR LIMIT=NONE] -->
     <string name="allset_button_hint">Tap the home button to go to your home screen</string>
-    <!-- Description of "All Set" page on the user's device [CHAR LIMIT=NONE] -->
+    <!-- Description of "All Set" page on the user's device when their device name is provided [CHAR LIMIT=NONE] -->
     <string name="allset_description_generic">You\u2019re ready to start using your <xliff:g id="device" example="Pixel 6">%1$s</xliff:g></string>
-    <!-- A default device name to use in the description of the "All Set" page [CHAR LIMIT=NONE] -->
-    <string name="default_device_name">device</string>
+    <!-- Description of "All Set" page on the user's device when no device name is provided [CHAR LIMIT=NONE] -->
+    <string name="allset_description_fallback">You\u2019re ready to start using your device</string>
     <!-- String linking to navigation settings on "All Set" page [CHAR LIMIT=NONE] -->
     <string name="allset_navigation_settings"><annotation id="link">System navigation settings</annotation></string>
 
diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
index c1bb2501b6..21a81a43bd 100644
--- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
@@ -171,10 +171,9 @@ public class AllSetActivity extends Activity {
 
         TextView subtitle = findViewById(R.id.subtitle);
         String suwDeviceName = intent.getStringExtra(EXTRA_DEVICE_NAME);
-        subtitle.setText(getString(
-                R.string.allset_description_generic,
-                !TextUtils.isEmpty(suwDeviceName)
-                        ? suwDeviceName : getString(R.string.default_device_name)));
+        subtitle.setText(TextUtils.isEmpty(suwDeviceName)
+                ? getString(R.string.allset_description_fallback)
+                : getString(R.string.allset_description_generic, suwDeviceName));
 
         TextView settings = findViewById(R.id.navigation_settings);
         settings.setTextColor(accentColor);