diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java
index 0c0da3e741..d96dcf71e7 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java
@@ -163,18 +163,24 @@ public final class Util {
    * Like {@link Build#DEVICE}, but in a place where it can be conveniently overridden for local
    * testing.
    */
+  // TODO: b/384699964 - Deprecate this and migrate usages to Build.DEVICE which works better with
+  //  Robolectric's ShadowBuild.setDevice().
   @UnstableApi public static final String DEVICE = Build.DEVICE;
 
   /**
    * Like {@link Build#MANUFACTURER}, but in a place where it can be conveniently overridden for
    * local testing.
    */
+  // TODO: b/384699964 - Deprecate this and migrate usages to Build.MANUFACTURER which works better
+  //  with Robolectric's ShadowBuild.setManufacturer().
   @UnstableApi public static final String MANUFACTURER = Build.MANUFACTURER;
 
   /**
    * Like {@link Build#MODEL}, but in a place where it can be conveniently overridden for local
    * testing.
    */
+  // TODO: b/384699964 - Deprecate this and migrate usages to Build.MODEL which works better with
+  //  Robolectric's ShadowBuild.setModel().
   @UnstableApi public static final String MODEL = Build.MODEL;
 
   /** A concise description of the device that it can be useful to log for debugging purposes. */
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java
index f1fe357b44..a4ebb52fc9 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java
@@ -29,6 +29,7 @@ import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.net.Uri;
+import android.os.Build;
 import android.provider.Settings.Global;
 import android.util.Pair;
 import android.util.SparseArray;
@@ -368,7 +369,7 @@ public final class AudioCapabilities {
   }
 
   private static boolean deviceMaySetExternalSurroundSoundGlobalSetting() {
-    return "Amazon".equals(Util.MANUFACTURER) || "Xiaomi".equals(Util.MANUFACTURER);
+    return Build.MANUFACTURER.equals("Amazon") || Build.MANUFACTURER.equals("Xiaomi");
   }
 
   private static int getChannelConfigForPassthrough(int channelCount) {