diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index cb9b87128d6..d958b38409b 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -74,25 +74,17 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
 
         private final Context mContext;
         private final SummaryLoader mSummaryLoader;
-        private final NfcPreferenceController mNfcPreferenceController;
 
         public SummaryProvider(Context context, SummaryLoader summaryLoader) {
             mContext = context;
             mSummaryLoader = summaryLoader;
-            mNfcPreferenceController = new NfcPreferenceController(context);
         }
 
-
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                if (mNfcPreferenceController.isAvailable()) {
-                    mSummaryLoader.setSummary(this,
-                            mContext.getString(R.string.connected_devices_dashboard_summary));
-                } else {
-                    mSummaryLoader.setSummary(this, mContext.getString(
-                            R.string.connected_devices_dashboard_no_nfc_summary));
-                }
+                mSummaryLoader.setSummary(this, mContext.getText(AdvancedConnectedDeviceController.
+                        getConnectedDevicesSummaryResourceId(mContext)));
             }
         }
     }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 90641792639..cea258d67ce 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -30,7 +30,6 @@ import android.content.pm.PackageManager;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowBluetoothPan;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;