diff --git a/libraries/common/src/main/java/androidx/media3/common/BundleListRetriever.java b/libraries/common/src/main/java/androidx/media3/common/BundleListRetriever.java
index 2e8ba90dc9..bb14e933d5 100644
--- a/libraries/common/src/main/java/androidx/media3/common/BundleListRetriever.java
+++ b/libraries/common/src/main/java/androidx/media3/common/BundleListRetriever.java
@@ -29,6 +29,7 @@ import androidx.media3.common.util.Util;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 
+// LINT.IfChange(javadoc)
 /**
  * A {@link Binder} to transfer a list of {@link Bundle Bundles} across processes by splitting the
  * list into multiple transactions.
@@ -40,7 +41,7 @@ import java.util.List;
  *
  * <pre>{@code
  * // Sender
- * List<Bundle> list = ...;
+ * ImmutableList<Bundle> list = ...;
  * IBinder binder = new BundleListRetriever(list);
  * Bundle bundle = new Bundle();
  * bundle.putBinder("list", binder);
@@ -48,7 +49,7 @@ import java.util.List;
  * // Receiver
  * Bundle bundle = ...; // Received from the sender
  * IBinder binder = bundle.getBinder("list");
- * List<Bundle> list = BundleListRetriever.getList(binder);
+ * ImmutableList<Bundle> list = BundleListRetriever.getList(binder);
  * }</pre>
  */
 @UnstableApi
diff --git a/libraries/common/src/main/java/androidx/media3/common/Player.java b/libraries/common/src/main/java/androidx/media3/common/Player.java
index da3b1836e4..bab7d72a8b 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Player.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Player.java
@@ -2868,6 +2868,7 @@ public interface Player {
    */
   TrackSelectionParameters getTrackSelectionParameters();
 
+  // LINT.IfChange(set_track_selection_parameters)
   /**
    * Sets the parameters constraining the track selection.
    *
diff --git a/libraries/common/src/main/java/androidx/media3/common/TrackSelectionParameters.java b/libraries/common/src/main/java/androidx/media3/common/TrackSelectionParameters.java
index b051e3548f..5f272fa229 100644
--- a/libraries/common/src/main/java/androidx/media3/common/TrackSelectionParameters.java
+++ b/libraries/common/src/main/java/androidx/media3/common/TrackSelectionParameters.java
@@ -49,6 +49,7 @@ import java.util.Set;
 import org.checkerframework.checker.initialization.qual.UnknownInitialization;
 import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 
+// LINT.IfChange(javadoc)
 /**
  * Parameters for controlling track selection.
  *
@@ -58,12 +59,12 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
  *
  * <pre>{@code
  * // Build on the current parameters.
- * TrackSelectionParameters currentParameters = player.getTrackSelectionParameters()
+ * TrackSelectionParameters currentParameters = player.getTrackSelectionParameters();
  * // Build the resulting parameters.
  * TrackSelectionParameters newParameters = currentParameters
  *     .buildUpon()
  *     .setMaxVideoSizeSd()
- *     .setPreferredAudioLanguage("deu")
+ *     .setPreferredAudioLanguage("de")
  *     .build();
  * // Set the new parameters.
  * player.setTrackSelectionParameters(newParameters);
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java
index 879df27524..1f9bcd14be 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java
@@ -87,6 +87,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+// LINT.IfChange(javadoc)
 /**
  * A default {@link TrackSelector} suitable for most use cases.
  *
diff --git a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java
index d7aa36033c..9fe93f1554 100644
--- a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java
+++ b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java
@@ -46,6 +46,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
 
+// LINT.IfChange(javadoc)
 /**
  * A downloader for DASH streams.
  *
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java
index 7c82bee608..143128a7c9 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java
@@ -35,6 +35,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.Executor;
 
+// LINT.IfChange(javadoc)
 /**
  * A downloader for HLS streams.
  *
diff --git a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java
index 6d2ded5a4c..3a88a1d164 100644
--- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java
+++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java
@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
 
+// LINT.IfChange(javadoc)
 /**
  * A downloader for SmoothStreaming streams.
  *
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaBrowser.java b/libraries/session/src/main/java/androidx/media3/session/MediaBrowser.java
index 87165bdb51..2ca3302c53 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaBrowser.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaBrowser.java
@@ -140,24 +140,25 @@ public final class MediaBrowser extends MediaController {
       return this;
     }
 
+    // LINT.IfChange(build_async)
     /**
      * Builds a {@link MediaBrowser} asynchronously.
      *
      * <p>The browser instance can be obtained like the following example:
      *
      * <pre>{@code
-     * MediaBrowser.Builder builder = ...;
+     * MediaBrowser.Builder builder = new MediaBrowser.Builder(context, sessionToken);
      * ListenableFuture<MediaBrowser> future = builder.buildAsync();
      * future.addListener(() -> {
      *   try {
      *     MediaBrowser browser = future.get();
      *     // The session accepted the connection.
-     *   } catch (ExecutionException e) {
+     *   } catch (ExecutionException | InterruptedException e) {
      *     if (e.getCause() instanceof SecurityException) {
      *       // The session rejected the connection.
      *     }
      *   }
-     * }, ContextCompat.getMainExecutor());
+     * }, ContextCompat.getMainExecutor(context));
      * }</pre>
      *
      * <p>The future must be kept by callers until the future is complete to get the controller