diff --git a/src/com/android/telecomm/PhoneAccountRegistrar.java b/src/com/android/telecomm/PhoneAccountRegistrar.java
index d089e17..2deb557 100644
--- a/src/com/android/telecomm/PhoneAccountRegistrar.java
+++ b/src/com/android/telecomm/PhoneAccountRegistrar.java
@@ -272,6 +272,7 @@
             new Json<PhoneAccountMetadata>() {
         private static final String ACCOUNT = "account";
         private static final String HANDLE = "handle";
+        private static final String SUBSCRIPTION_NUMBER = "subscription_number";
         private static final String CAPABILITIES = "capabilities";
         private static final String ICON_RES_ID = "icon_res_id";
         private static final String LABEL = "label";
@@ -283,6 +284,7 @@
             return new JSONObject()
                     .put(ACCOUNT, sPhoneAccountJson.toJson(o.getAccount()))
                     .put(HANDLE, o.getHandle().toString())
+                    .put(SUBSCRIPTION_NUMBER, o.getSubscriptionNumber())
                     .put(CAPABILITIES, o.getCapabilities())
                     .put(ICON_RES_ID, o.getIconResId())
                     .put(LABEL, o.getLabel())
@@ -295,6 +297,7 @@
             return new PhoneAccountMetadata(
                     sPhoneAccountJson.fromJson((JSONObject) json.get(ACCOUNT)),
                     Uri.parse((String) json.get(HANDLE)),
+                    (String) json.get(SUBSCRIPTION_NUMBER),
                     (int) json.get(CAPABILITIES),
                     (int) json.get(ICON_RES_ID),
                     (String) json.get(LABEL),
diff --git a/src/com/android/telecomm/TelecommApp.java b/src/com/android/telecomm/TelecommApp.java
index fd35708..15e489a 100644
--- a/src/com/android/telecomm/TelecommApp.java
+++ b/src/com/android/telecomm/TelecommApp.java
@@ -84,6 +84,7 @@
                                 "com.google.android.apps.babel.telephony.TeleConnectionService"),
                         "null_id"),
                 Uri.fromParts("tel", "null_uri", null),
+                "650-253-0000",
                 PhoneAccountMetadata.CAPABILITY_CALL_PROVIDER,
                 R.drawable.stat_sys_phone_call,
                 "Wi-Fi calling",
