diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6dfb984..da56e04 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -456,6 +456,10 @@
             android:label="@string/launcherActivityLabel"
             android:theme="@style/BackgroundOnlyTheme" />
 
+        <activity android:name=".common.vcard.ShareVCardActivity"
+                  android:label="@string/launcherActivityLabel"
+                  android:theme="@style/BackgroundOnlyTheme" />
+
         <service
             android:name=".common.vcard.VCardService"
             android:exported="false" />
@@ -523,7 +527,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.android.contacts.files"
+            android:authorities="@string/contacts_file_provider_authority"
             android:grantUriPermissions="true"
             android:exported="false">
             <meta-data
diff --git a/res/values/donottranslate_config.xml b/res/values/donottranslate_config.xml
index 5fc4f89..eda9487 100644
--- a/res/values/donottranslate_config.xml
+++ b/res/values/donottranslate_config.xml
@@ -42,4 +42,7 @@
     <!-- Help URL pointing to editing contacts in People. This is intentionally empty because
          the overlay will fill this in during build time. -->
     <string name="help_url_people_edit"></string>
+
+    <!-- File Authority for the photo picker -->
+    <string name="photo_file_provider_authority">com.android.contacts.files</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e216811..d8bcd57 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -805,9 +805,6 @@
     <!-- Prefix for messages that you sent [CHAR LIMIT=40] -->
     <string name="message_from_you_prefix">You: <xliff:g id="sms_body">%s</xliff:g></string>
 
-    <!-- File Authority for the photo picker -->
-    <string name="photo_file_provider_authority" translatable="false">com.android.contacts.files</string>
-
     <!-- When a user tries to create an IM Hangouts field, an alert dialog pops up displaying this message. We don't want users entering email addresses of phone numbers into the IM field. [CHAR LIMIT=200] -->
     <string name="contact_editor_hangouts_im_alert">Hangouts works better when you enter the person\'s Hangouts identifier into the email field or phone field.</string>
 
diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
index 55e26ef..2b6c667 100644
--- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
@@ -294,7 +294,10 @@
 
         // Remove the default account to emulate broken preferences.
         mTarget.removeDefaultAccountForTest();
-        assertTrue(mTarget.shouldShowAccountChangedNotification());
+
+        // The dialog shouldn't show up.
+        // The logic is, if there's a writable account, we'll pick it as default
+        assertFalse(mTarget.shouldShowAccountChangedNotification());
     }
 
     private static <T> Set<T> toSet(Collection<T> collection) {