diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 8156cc5..ea39aa6 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -936,13 +936,10 @@
      */
     @NeededForTesting
     String getNameForCall(ContactCacheEntry contactInfo) {
-        String preferredName = contactInfo.namePrimary;
-        if (mContactsPreferences != null) {
-            preferredName = ContactDisplayUtils.getPreferredDisplayName(
-                    contactInfo.namePrimary,
-                    contactInfo.nameAlternative,
-                    mContactsPreferences.getDisplayOrder());
-        }
+        String preferredName = ContactDisplayUtils.getPreferredDisplayName(
+                contactInfo.namePrimary,
+                contactInfo.nameAlternative,
+                mContactsPreferences);
         if (TextUtils.isEmpty(preferredName)) {
             return contactInfo.number;
         }
@@ -956,13 +953,10 @@
     String getNumberForCall(ContactCacheEntry contactInfo) {
         // If the name is empty, we use the number for the name...so don't show a second
         // number in the number field
-        String preferredName = contactInfo.namePrimary;
-        if (mContactsPreferences != null) {
-            preferredName = ContactDisplayUtils.getPreferredDisplayName(
+        String preferredName = ContactDisplayUtils.getPreferredDisplayName(
                     contactInfo.namePrimary,
                     contactInfo.nameAlternative,
-                    mContactsPreferences.getDisplayOrder());
-        }
+                    mContactsPreferences);
         if (TextUtils.isEmpty(preferredName)) {
             return contactInfo.location;
         }
diff --git a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
index 79c5fae..86002b0 100644
--- a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
@@ -20,6 +20,7 @@
 
 import android.content.Context;
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
@@ -206,7 +207,7 @@
     /**
      * ContactsPreferences used to lookup displayName preferences
      */
-    private final ContactsPreferences mContactsPreferences;
+    @Nullable private final ContactsPreferences mContactsPreferences;
 
     /**
      * The layout inflater used to inflate new views.
@@ -236,7 +237,7 @@
 
         mListView = listView;
         mContext = context;
-        mContactsPreferences = new ContactsPreferences(mContext);
+        mContactsPreferences = ContactsPreferencesFactory.newContactsPreferences(mContext);
         mLayoutInflater = layoutInflater;
         mContactPhotoManager = contactPhotoManager;
     }
@@ -249,8 +250,10 @@
      *                                      conference.
      */
     public void updateParticipants(List<Call> conferenceParticipants, boolean parentCanSeparate) {
-        mContactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
-        mContactsPreferences.refreshValue(ContactsPreferences.SORT_ORDER_KEY);
+        if (mContactsPreferences != null) {
+            mContactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
+            mContactsPreferences.refreshValue(ContactsPreferences.SORT_ORDER_KEY);
+        }
         mParentCanSeparate = parentCanSeparate;
         updateParticipantInfo(conferenceParticipants);
     }
@@ -361,7 +364,7 @@
 
         setCallerInfoForRow(result, contactCache.namePrimary,
                 ContactDisplayUtils.getPreferredDisplayName(contactCache.namePrimary,
-                        contactCache.nameAlternative, mContactsPreferences.getDisplayOrder()),
+                        contactCache.nameAlternative, mContactsPreferences),
                 contactCache.number, contactCache.label,
                 contactCache.lookupKey, contactCache.displayPhotoUri, thisRowCanSeparate,
                 thisRowCanDisconnect);
@@ -513,7 +516,7 @@
                         ContactDisplayUtils.getPreferredSortName(
                                 c1.namePrimary,
                                 c1.nameAlternative,
-                                mContactsPreferences.getSortOrder()),
+                                mContactsPreferences),
                         "");
 
                 ContactCacheEntry c2 = p2.getContactCacheEntry();
@@ -521,7 +524,7 @@
                         ContactDisplayUtils.getPreferredSortName(
                                 c2.namePrimary,
                                 c2.nameAlternative,
-                                mContactsPreferences.getSortOrder()),
+                                mContactsPreferences),
                         "");
 
                 return p1Name.compareToIgnoreCase(p2Name);
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 66091bd..623cbb6 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -397,11 +397,8 @@
             return mContext.getResources().getString(R.string.card_title_conf_call);
         }
 
-        String preferredName = contactInfo.namePrimary;
-        if (mContactsPreferences != null) {
-            preferredName = ContactDisplayUtils.getPreferredDisplayName(contactInfo.namePrimary,
-                    contactInfo.nameAlternative, mContactsPreferences.getDisplayOrder());
-        }
+        String preferredName = ContactDisplayUtils.getPreferredDisplayName(contactInfo.namePrimary,
+                    contactInfo.nameAlternative, mContactsPreferences);
         if (TextUtils.isEmpty(preferredName)) {
             return TextUtils.isEmpty(contactInfo.number) ? null : BidiFormatter.getInstance()
                     .unicodeWrap(contactInfo.number, TextDirectionHeuristics.LTR);