diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioTranscodingSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioTranscodingSamplePipeline.java
index db0b86837a..cc0dbc531e 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioTranscodingSamplePipeline.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioTranscodingSamplePipeline.java
@@ -334,8 +334,8 @@ import org.checkerframework.dataflow.qual.Pure;
   @Pure
   private static TransformationRequest createFallbackTransformationRequest(
       TransformationRequest transformationRequest, Format requestedFormat, Format actualFormat) {
-    // TODO(b/210591626): Also update bitrate and other params once encoder configuration and
-    // fallback are implemented.
+    // TODO(b/259570024): Consider including bitrate and other audio characteristics in the revised
+    //  fallback design.
     if (Util.areEqual(requestedFormat.sampleMimeType, actualFormat.sampleMimeType)) {
       return transformationRequest;
     }
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java
index 12158d5491..8ddc206823 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java
@@ -175,7 +175,6 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory {
 
   @Override
   public DefaultCodec createForAudioEncoding(Format format) throws TransformationException {
-    // TODO(b/210591626) Add encoder selection for audio.
     checkNotNull(format.sampleMimeType);
     MediaFormat mediaFormat =
         MediaFormat.createAudioFormat(
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 9d0ee85795..4b7efd1c02 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
@@ -325,8 +325,7 @@ import org.checkerframework.dataflow.qual.Pure;
       Format requestedFormat,
       Format supportedFormat,
       @TransformationRequest.HdrMode int supportedHdrMode) {
-    // TODO(b/210591626): Also update bitrate etc. once encoder configuration and fallback are
-    //  implemented.
+    // TODO(b/259570024): Consider including bitrate in the revised fallback design.
     if (transformationRequest.hdrMode == supportedHdrMode
         && Util.areEqual(requestedFormat.sampleMimeType, supportedFormat.sampleMimeType)
         && (hasOutputFormatRotation