diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaController.java b/libraries/session/src/main/java/androidx/media3/session/MediaController.java
index be700a5de3..4961d0a2c8 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java
@@ -163,8 +163,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  * the {@link MediaSessionCompat.Callback#onAddQueueItem onAddQueueItem} and {@link
  * MediaSessionCompat.Callback#onRemoveQueueItem} onRemoveQueueItem} callbacks. Check {@link
  * #getAvailableCommands()} to see if playlist modifications are {@linkplain
- * androidx.media3.common.Player.Command#COMMAND_CHANGE_MEDIA_ITEMS supported} by the legacy
- * session.
+ * androidx.media3.common.Player#COMMAND_CHANGE_MEDIA_ITEMS supported} by the legacy session.
  */
 @DoNotMock
 public class MediaController implements Player {
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaSession.java b/libraries/session/src/main/java/androidx/media3/session/MediaSession.java
index 6823a73687..44f7878ba2 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaSession.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaSession.java
@@ -1367,7 +1367,7 @@ public class MediaSession {
      *   <li>{@link MediaControllerCompat.TransportControls#playFromMediaId playFromMediaId}
      *   <li>{@link MediaControllerCompat.TransportControls#prepareFromSearch prepareFromSearch}
      *   <li>{@link MediaControllerCompat.TransportControls#playFromSearch playFromSearch}
-     *   <li>{@link MediaControllerCompat.TransportControls#addQueueItem addQueueItem}
+     *   <li>{@link MediaControllerCompat#addQueueItem addQueueItem}
      * </ul>
      *
      * The values of {@link MediaItem#mediaId}, {@link MediaItem.RequestMetadata#mediaUri}, {@link
@@ -1433,7 +1433,7 @@ public class MediaSession {
      *   <li>{@link MediaControllerCompat.TransportControls#playFromMediaId playFromMediaId}
      *   <li>{@link MediaControllerCompat.TransportControls#prepareFromSearch prepareFromSearch}
      *   <li>{@link MediaControllerCompat.TransportControls#playFromSearch playFromSearch}
-     *   <li>{@link MediaControllerCompat.TransportControls#addQueueItem addQueueItem}
+     *   <li>{@link MediaControllerCompat#addQueueItem addQueueItem}
      * </ul>
      *
      * The values of {@link MediaItem#mediaId}, {@link MediaItem.RequestMetadata#mediaUri}, {@link
diff --git a/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/TestPlayerRunHelper.java b/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/TestPlayerRunHelper.java
index 1cbd1f846b..d9106acdbe 100644
--- a/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/TestPlayerRunHelper.java
+++ b/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/TestPlayerRunHelper.java
@@ -71,7 +71,7 @@ public final class TestPlayerRunHelper {
    * <p>If an error occurs while a {@code untilXXX(...)} method is waiting for the condition to
    * become true, most methods will throw that error (exceptions to this are documented on specific
    * methods below). Use {@link #ignoringNonFatalErrors()} to ignore non-fatal errors and only fail
-   * on {@linkplain Player.Listener#getPlayerError() fatal playback errors}.
+   * on {@linkplain Player#getPlayerError() fatal playback errors}.
    *
    * <p>Instances of this class should only be used for a single {@code untilXXX()} invocation and
    * not be re-used.