diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
index ffb8ed106d..4f0d122254 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
@@ -40,7 +40,6 @@ import androidx.media3.common.util.Log;
 import androidx.media3.common.util.MediaFormatUtil;
 import androidx.media3.common.util.TraceUtil;
 import androidx.media3.common.util.UnstableApi;
-import androidx.media3.common.util.Util;
 import androidx.media3.decoder.DecoderInputBuffer;
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableList;
@@ -108,7 +107,7 @@ public final class DefaultCodec implements Codec {
     @Nullable Surface inputSurface = null;
     try {
       boolean requestedHdrToneMapping =
-          Util.SDK_INT >= 29 && Api29.isSdrToneMappingEnabled(configurationMediaFormat);
+          SDK_INT >= 29 && Api29.isSdrToneMappingEnabled(configurationMediaFormat);
       mediaCodec = MediaCodec.createByCodecName(mediaCodecName);
       configureCodec(mediaCodec, configurationMediaFormat, isDecoder, outputSurface);
       if (SDK_INT >= 29 && requestedHdrToneMapping) {
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java b/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
index 8c17b14a90..bc6d275044 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
@@ -88,7 +88,7 @@ public final class EncoderUtil {
     for (int i = 0; i < mediaCodecInfos.size(); i++) {
       MediaCodecInfo mediaCodecInfo = mediaCodecInfos.get(i);
       if (mediaCodecInfo.isAlias()
-          || !EncoderUtil.isFeatureSupported(
+          || !isFeatureSupported(
               mediaCodecInfo, mimeType, MediaCodecInfo.CodecCapabilities.FEATURE_HdrEditing)) {
         continue;
       }
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
index 3f4402f0a3..d14c0f3a59 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
@@ -537,8 +537,9 @@ public final class Transformer {
      * @param originalTransformationRequest The unsupported {@link TransformationRequest} used when
      *     building {@link Transformer}.
      * @param fallbackTransformationRequest The alternative {@link TransformationRequest}, with
-     *     supported {@link TransformationRequest#outputHeight} and {@link
-     *     TransformationRequest#videoMimeType} values set.
+     *     supported {@link TransformationRequest#audioMimeType}, {@link
+     *     TransformationRequest#videoMimeType}, {@link TransformationRequest#outputHeight}, and
+     *     {@link TransformationRequest#enableRequestSdrToneMapping} values set.
      */
     default void onFallbackApplied(
         MediaItem inputMediaItem,