diff --git a/res/layout-sw320dp/settings_entity_header.xml b/res/layout-sw320dp/settings_entity_header.xml
index 951961c53e8..481a9c4cf85 100644
--- a/res/layout-sw320dp/settings_entity_header.xml
+++ b/res/layout-sw320dp/settings_entity_header.xml
@@ -45,6 +45,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:orientation="vertical">
@@ -57,8 +58,7 @@
                 android:singleLine="false"
                 android:ellipsize="marquee"
                 android:gravity="start"
-                android:textDirection="locale"
-                android:paddingTop="8dp" />
+                android:textDirection="locale" />
 
             <TextView
                 android:id="@+id/install_type"
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 9898c33be3c..127730ba39a 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -176,7 +176,6 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
                     new BluetoothDevicePreference(mPrefContext, cachedDevice,
                             mShowDeviceWithoutNames);
             btPreference.setOnGearClickListener(mDeviceProfilesListener);
-            btPreference.setSummary(R.string.summary_placeholder);
             mPreferenceMap.put(device, btPreference);
             mDevicePreferenceCallback.onDeviceAdded(btPreference);
         }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index 823bcbe7edf..4294dfbbc76 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -95,8 +95,6 @@ public class BluetoothDeviceUpdaterTest {
 
         final Preference preference = mBluetoothDeviceUpdater.mPreferenceMap.get(mBluetoothDevice);
         assertThat(preference).isNotNull();
-        assertThat(preference.getSummary()).isEqualTo(
-                mContext.getString(R.string.summary_placeholder));
         verify(mDevicePreferenceCallback).onDeviceAdded(preference);
     }