diff --git a/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java
index 03fddecea56..d6dcbf149bc 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java
@@ -100,7 +100,8 @@ public class StorageSelectionPreferenceController extends BasePreferenceControll
         if (mOnItemSelectedListener == null) {
             return;
         }
-        mOnItemSelectedListener.onItemSelected(mStorageAdapter.getItem(position));
+        mOnItemSelectedListener.onItemSelected(
+                (StorageEntry) mSpinnerPreference.getSelectedItem());
     }
 
     @Override
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 5582ff4dc8d..249ce7223fc 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -32,10 +32,8 @@ android_test {
         "platform-test-annotations",
         "truth-prebuilt",
         "ub-uiautomator",
-        "SettingsLibSettingsSpinner",
-        "SettingsLibUsageProgressBarPreference",
-        "SettingsLibTwoTargetPreference",
-        "SettingsLibMainSwitchPreference",
+        // Don't add SettingsLib libraries here - you can use them directly as they are in the
+        // instrumented Settings app.
     ],
 
     // Include all test java files.