diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
index 2c786483dc..6d91aff09f 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
@@ -293,8 +293,8 @@ import org.checkerframework.dataflow.qual.Pure;
   }
 
   private static boolean deviceNeedsNoToneMappingWorkaround() {
-    // Pixel build ID does not support tone mapping. See http://b/249297370#comment8.
-    return Build.ID.startsWith("TP1A.220905.004");
+    // Pixel build ID prefix does not support tone mapping. See http://b/249297370#comment8.
+    return Util.MANUFACTURER.equals("Google") && Build.ID.startsWith("TP1A");
   }
 
   /**