Fix localization for devices in other languages.

Bug: 275073444
Test: Manually
Change-Id: I39640260cb636f1a14a1ad374add7e983f70ea00
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/DeviceUtils.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/DeviceUtils.java
index 925a344..8c37529 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/DeviceUtils.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/DeviceUtils.java
@@ -63,27 +63,27 @@
     }
 
     /**
-     * Returns a string representation of a device form factor. Supported form factors are:
-     * {@link #{R.string.mr_device_form_factor_phone} and
-     * @link #{R.string.mr_device_form_factor_tablet} and
-     * @link #{R.string.mr_device_form_factor_tv} and
-     * @link #{R.string.mr_device_form_factor_watch} and
-     * @link #{R.string.mr_device_form_factor_car} and
-     * @link #{R.string.mr_device_form_factor_unknown}}
+     * Returns a device specific string representation of wifi warning description. It can be one
+     * of the following values: {@link #{R.string.mr_chooser_wifi_warning_description_phone} and
+     * @link #{R.string.mr_chooser_wifi_warning_description_tablet} and
+     * @link #{R.string.mr_chooser_wifi_warning_description_tv} and
+     * @link #{R.string.mr_chooser_wifi_warning_description_watch} and
+     * @link #{R.string.mr_chooser_wifi_warning_description_car} and
+     * @link #{R.string.mr_chooser_wifi_warning_description_unknown}}
      */
-    static String getDeviceFormFactorString(@NonNull Context context) {
+    static String getDialogChooserWifiWarningDescription(@NonNull Context context) {
         if (isPhone(context) || isFoldable(context)) {
-            return context.getString(R.string.mr_device_form_factor_phone);
+            return context.getString(R.string.mr_chooser_wifi_warning_description_phone);
         } else if (isTablet(context) || isSevenInchTablet(context)) {
-            return context.getString(R.string.mr_device_form_factor_tablet);
+            return context.getString(R.string.mr_chooser_wifi_warning_description_tablet);
         } else if (isTv(context)) {
-            return context.getString(R.string.mr_device_form_factor_tv);
+            return context.getString(R.string.mr_chooser_wifi_warning_description_tv);
         } else if (isWearable(context)) {
-            return context.getString(R.string.mr_device_form_factor_watch);
+            return context.getString(R.string.mr_chooser_wifi_warning_description_watch);
         } else if (isAuto(context)) {
-            return context.getString(R.string.mr_device_form_factor_car);
+            return context.getString(R.string.mr_chooser_wifi_warning_description_car);
         } else {
-            return context.getString(R.string.mr_device_form_factor_unknown);
+            return context.getString(R.string.mr_chooser_wifi_warning_description_unknown);
         }
     }
 
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
index 13c2dc7..f477981 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
@@ -238,9 +238,7 @@
         mSearchingProgressBar = findViewById(R.id.mr_chooser_search_progress_bar);
 
 
-        String formFactor = DeviceUtils.getDeviceFormFactorString(getContext());
-        String wifiWarningText =
-                getContext().getString(R.string.mr_chooser_wifi_warning_description, formFactor);
+        String wifiWarningText = DeviceUtils.getDialogChooserWifiWarningDescription(getContext());
         mWifiWarningTextView.setText(wifiWarningText);
 
         mLearnMoreTextView.setMovementMethod(LinkMovementMethod.getInstance());
diff --git a/mediarouter/mediarouter/src/main/res/layout/mr_chooser_dialog.xml b/mediarouter/mediarouter/src/main/res/layout/mr_chooser_dialog.xml
index 5050bf4..5735fe5 100644
--- a/mediarouter/mediarouter/src/main/res/layout/mr_chooser_dialog.xml
+++ b/mediarouter/mediarouter/src/main/res/layout/mr_chooser_dialog.xml
@@ -70,7 +70,7 @@
                     android:id="@+id/mr_chooser_wifi_warning_description"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/mr_chooser_wifi_warning_description"
+                    android:text="@string/mr_chooser_wifi_warning_description_phone"
                     android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText" />
 
                 <TextView
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
index 8a468c1..8cdac9b 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"No devices available"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"Make sure the other device is on the same Wi-Fi network as this %s"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"Learn more"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"Learn how to cast"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"phone"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"tablet"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"tv"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"watch"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"car"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"device"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
index 979487c..9597c16 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎Play on a group‎‏‎‎‏‎"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎No info available‎‏‎‎‏‎"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎No devices available‎‏‎‎‏‎"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎Make sure the other device is on the same Wi-Fi network as this %s‎‏‎‎‏‎"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎"<a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"‎‏‎‎‏‏‏‎Learn more‎‏‎‎‏‏‎"</a>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎Learn how to cast‎‏‎‎‏‎"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎phone‎‏‎‎‏‎"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎tablet‎‏‎‎‏‎"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎tv‎‏‎‎‏‎"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎watch‎‏‎‎‏‎"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎car‎‏‎‎‏‎"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎device‎‏‎‎‏‎"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ja/strings.xml b/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
index e77f373..4142020 100644
--- a/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"グループで再生"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"情報がありません"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"利用可能なデバイスがありません"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"他のデバイスがこの%sと同じ Wi-Fi ネットワークに接続していることを確認してください"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"詳細"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"キャスト方法"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"スマートフォン"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"タブレット"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"テレビ"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"スマートウォッチ"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"車"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"デバイス"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ml/strings.xml b/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
index 37e09b3..43b2b66 100644
--- a/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ഒരു ഗ്രൂപ്പിൽ പ്ലേ ചെയ്യുക"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"വിവരങ്ങളൊന്നും ലഭ്യമല്ല"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"ഉപകരണങ്ങളൊന്നും ലഭ്യമല്ല"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"%s ഉള്ള അതേ വൈഫൈ നെറ്റ്‌വർക്കിലാണ് മറ്റ് ഉപകരണവും കണക്‌റ്റ് ചെയ്‌തിട്ടുള്ളതെന്ന് ഉറപ്പാക്കുക"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"കൂടുതലറിയുക"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"എങ്ങനെ കാസ്‌റ്റുചെയ്യണമെന്ന് അറിയുക"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"ഫോൺ"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"ടാബ്‌ലെറ്റ്"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"ടിവി"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"വാച്ച്"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"കാർ"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"ഉപകരണം"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-my/strings.xml b/mediarouter/mediarouter/src/main/res/values-my/strings.xml
index ef3141c..2b1a36b 100644
--- a/mediarouter/mediarouter/src/main/res/values-my/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-my/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"အုပ်စုလိုက် ဖွင့်ခြင်း"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"အချက်အလက် မရရှိနိုင်ပါ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"စက်များ မရနိုင်ပါ"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"အခြားစက်သည် ဤ %s နှင့် Wi-Fi ကွန်ရက်တစ်ခုတည်းတွင် ရှိနေကြောင်း သေချာပါစေ"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"ပိုမိုလေ့လာရန်"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"ကာစ်လုပ်ပုံကို လေ့လာရန်"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"ဖုန်း"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"တက်ဘလက်"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"tv"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"လက်ပတ်နာရီ"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"ကား"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"စက်"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-te/strings.xml b/mediarouter/mediarouter/src/main/res/values-te/strings.xml
index e2dc55e..ffa1c26 100644
--- a/mediarouter/mediarouter/src/main/res/values-te/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-te/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"గ్రూప్‌లో ప్లే చేయండి"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"సమాచారం అందుబాటులో లేదు"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"పరికరాలు ఏవీ అందుబాటులో లేవు"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"ఇతర పరికరం ఈ %s లాగా అదే Wi-Fi నెట్‌వర్క్‌లో ఉందని నిర్ధారించుకోండి"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"మరింత తెలుసుకోండి"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"ఎలా ప్రసారం చేయాలో తెలుసుకోండి"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"ఫోన్"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"టాబ్లెట్"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"టీవీ"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"వాచ్"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"కారు"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"పరికరం"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-tl/strings.xml b/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
index 3500cd8..a5e059c 100644
--- a/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"I-play sa isang pangkat"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Walang available na impormasyon"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Walang available na device"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"Tiyaking nasa iisang Wi-Fi network ang ibang device at ang %s na ito"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"Matuto pa"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"Matutunan kung paano mag-cast"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"telepono"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"tablet"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"tv"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"relo"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"sasakyan"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"device"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
index a14281b5..b1a82c1 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在一组设备上播放"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"没有任何相关信息"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"没有可用的设备"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"确保另一设备与此%s连接到同一 WLAN 网络"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"了解详情"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"了解如何投放"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"手机"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"平板电脑"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"电视"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"手表"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"汽车"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"设备"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
index 52add3a..645a8ba 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在群組裝置中播放"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"沒有資料可以提供"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"沒有可用的裝置"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"確認其他裝置與這部「%s」連上同一個 Wi-Fi 網路"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"瞭解詳情"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"瞭解如何投放"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"手機"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"平板電腦"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"電視"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"智慧手錶"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"汽車"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"裝置"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
index 68f4211..0ca1d5f 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
@@ -43,13 +43,6 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在群組上播放"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"沒有可用的資訊"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"找不到裝置"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="5384406081821852110">"確認其他裝置與這部「%s」連上同一個 Wi-Fi 網路"</string>
     <string name="mr_chooser_wifi_learn_more" msgid="3799500840179081429"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">"瞭解詳情"</a></string>
     <string name="ic_media_route_learn_more_accessibility" msgid="9119039724000326934">"瞭解如何投放"</string>
-    <string name="mr_device_form_factor_phone" msgid="7463328381315022261">"手機"</string>
-    <string name="mr_device_form_factor_tablet" msgid="6055165768102218762">"平板電腦"</string>
-    <string name="mr_device_form_factor_tv" msgid="1365190301383785606">"電視"</string>
-    <string name="mr_device_form_factor_watch" msgid="6608514228922329622">"智慧手錶"</string>
-    <string name="mr_device_form_factor_car" msgid="6309192271294837853">"汽車"</string>
-    <string name="mr_device_form_factor_unknown" msgid="3992085921148873128">"裝置"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values/strings.xml b/mediarouter/mediarouter/src/main/res/values/strings.xml
index fa295bd..7cb83b0a6 100644
--- a/mediarouter/mediarouter/src/main/res/values/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values/strings.xml
@@ -102,17 +102,14 @@
     <string name="mr_chooser_zero_routes_found_title">No devices available</string>
 
     <!-- Text displayed to hint making sure device and cast device are connected to the same Wi-Fi. [CHAR_LIMIT=NONE] -->
-    <string name="mr_chooser_wifi_warning_description">Make sure the other device is on the same Wi-Fi network as this %s</string>
+    <string name="mr_chooser_wifi_warning_description_phone">Make sure the other device is on the same Wi-Fi network as this phone</string>
+    <string name="mr_chooser_wifi_warning_description_tablet">Make sure the other device is on the same Wi-Fi network as this tablet</string>
+    <string name="mr_chooser_wifi_warning_description_tv">Make sure the other device is on the same Wi-Fi network as this tv</string>
+    <string name="mr_chooser_wifi_warning_description_watch">Make sure the other device is on the same Wi-Fi network as this watch</string>
+    <string name="mr_chooser_wifi_warning_description_car">Make sure the other device is on the same Wi-Fi network as this car</string>
+    <string name="mr_chooser_wifi_warning_description_unknown">Make sure the other device is on the same Wi-Fi network as this device</string>
 
     <!-- Text displayed to link the user to the support article. [CHAR_LIMIT=NONE] -->
     <string name="mr_chooser_wifi_learn_more"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">Learn more</a></string>
     <string name="ic_media_route_learn_more_accessibility">Learn how to cast</string>
-
-    <!-- Text displayed representing different form factors of devices. [CHAR_LIMIT=NONE] -->
-    <string name="mr_device_form_factor_phone">phone</string>
-    <string name="mr_device_form_factor_tablet">tablet</string>
-    <string name="mr_device_form_factor_tv">tv</string>
-    <string name="mr_device_form_factor_watch">watch</string>
-    <string name="mr_device_form_factor_car">car</string>
-    <string name="mr_device_form_factor_unknown">device</string>
 </resources>