Merge "Move "Blocked numbers" to Settings."
diff --git a/res-common/drawable/ic_device.xml b/res-common/drawable/ic_device.xml
new file mode 100644
index 0000000..7fd3bd5
--- /dev/null
+++ b/res-common/drawable/ic_device.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- ic_device is a phone-shaped icon. Since it is not tinted so we set the tint color in here. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+<path
+    android:fillColor="#7f7f7f"
+    android:pathData="M17 1.01L7 1c-1.1 0-2 .9-2 2v18c0 1.1.9 2 2 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-1.99-2-1.99zM17 19H7V5h10v14z"/>
+</vector>
\ No newline at end of file
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 34b8fb3..264d0c9 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -207,8 +207,8 @@
 
     <!-- Title for data source when creating or editing a contact that doesn't
          belong to a specific account.  This contact will only exist on the phone
-         and will not be synced. -->
-    <string name="account_phone">Phone-only, unsynced</string>
+         and will not be synced. [CHAR LIMIT=20]  -->
+    <string name="account_phone">Device</string>
 
     <!-- Header that expands to list all name types when editing a structured name of a contact
          [CHAR LIMIT=20] -->