diff --git a/res/values/strings.xml b/res/values/strings.xml
index 78aee500710..556a9796376 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8273,8 +8273,6 @@
 
     <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
     <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></string>
-    <!-- Summary of a single storage volume free space. [DEPRECATED, TO BE REMOVED] [CHAR LIMIT=48]-->
-    <string name="storage_volume_free"><xliff:g id="total" example="32GB">%1$s</xliff:g> free</string>
     <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
     <string name="storage_volume_total">Used of <xliff:g id="total" example="32GB">%1$s</xliff:g></string>
     <!-- The percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=4]-->
diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
index c4613edf3f6..890d99e2845 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
@@ -55,8 +55,8 @@ public class StorageSummaryDonutPreferenceController extends PreferenceControlle
         summary.setTitle(TextUtils.expandTemplate(
                 mContext.getText(R.string.storage_size_large_alternate), result.value,
                 result.units));
-        summary.setSummary(mContext.getString(R.string.storage_volume_free,
-                Formatter.formatFileSize(mContext, mTotalBytes - mUsedBytes)));
+        summary.setSummary(mContext.getString(R.string.storage_volume_total,
+                Formatter.formatShortFileSize(mContext, mTotalBytes)));
         summary.setPercent(mUsedBytes, mTotalBytes);
         summary.setEnabled(true);
     }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
index cbf3414424c..2c091f27893 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -55,6 +55,9 @@ import java.io.File;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class StorageSummaryDonutPreferenceControllerTest {
+    private static final long KILOBYTE = 1024; // Note: When O comes around, this value changes!
+    private static final long MEGABYTE = KILOBYTE * KILOBYTE;
+    private static final long GIGABYTE = KILOBYTE * MEGABYTE;
     private Context mContext;
     private StorageSummaryDonutPreferenceController mController;
     private StorageSummaryDonutPreference mPreference;
@@ -80,20 +83,20 @@ public class StorageSummaryDonutPreferenceControllerTest {
 
     @Test
     public void testEmpty() throws Exception {
-        mController.updateBytes(0, 0);
+        mController.updateBytes(0, 32 * GIGABYTE);
         mController.updateState(mPreference);
 
         assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("0.00B free");
+        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 32GB");
     }
 
     @Test
-    public void testUsedStorage() throws Exception {
-        mController.updateBytes(1024, 1024 * 10);
+    public void testTotalStorage() throws Exception {
+        mController.updateBytes(KILOBYTE, KILOBYTE * 10);
         mController.updateState(mPreference);
 
         assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("9.00KB free");
+        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB");
     }
 
     @Test
@@ -102,15 +105,15 @@ public class StorageSummaryDonutPreferenceControllerTest {
         File file = Mockito.mock(File.class);
         StorageVolumeProvider svp = Mockito.mock(StorageVolumeProvider.class);
         when(volume.getPath()).thenReturn(file);
-        when(file.getTotalSpace()).thenReturn(1024L * 10);
-        when(file.getFreeSpace()).thenReturn(1024L);
-        when(svp.getPrimaryStorageSize()).thenReturn(1024L * 10);
+        when(file.getTotalSpace()).thenReturn(KILOBYTE * 10);
+        when(file.getFreeSpace()).thenReturn(KILOBYTE);
+        when(svp.getPrimaryStorageSize()).thenReturn(KILOBYTE * 10);
 
         mController.updateSizes(svp, volume);
         mController.updateState(mPreference);
 
         assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB");
-        assertThat(mPreference.getSummary().toString()).isEqualTo("1.00KB free");
+        assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB");
     }
 
     @Test