diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java
index 1484843bc0..194d8f1fbc 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java
@@ -1261,7 +1261,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
           /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
           /* positionDiscontinuity= */ currentItemRemoved,
           DISCONTINUITY_REASON_REMOVE,
-          /* mediaItemTransition*/ playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex
+          /* mediaItemTransition= */ playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex
                   >= fromIndex
               && playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex < clippedToIndex,
           MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED);
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerStub.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerStub.java
index f4edcc8ec4..ad76da2e6e 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaControllerStub.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaControllerStub.java
@@ -183,7 +183,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
         controller ->
             controller.onPlayerInfoChanged(
                 playerInfo,
-                /* timelineChangedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE,
+                /* timelineChangedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE,
                 isTimelineExcluded));
   }
 
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaUtils.java b/libraries/session/src/main/java/androidx/media3/session/MediaUtils.java
index d85bc1194b..644e625554 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaUtils.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaUtils.java
@@ -320,7 +320,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     return result;
   }
 
-  /* Converts a {@link MediaItem} to a {@link MediaDescriptionCompat}. */
+  /** Converts a {@link MediaItem} to a {@link MediaDescriptionCompat}. */
   public static MediaDescriptionCompat convertToMediaDescriptionCompat(MediaItem item) {
     MediaDescriptionCompat.Builder builder =
         new MediaDescriptionCompat.Builder()
diff --git a/libraries/session/src/main/java/androidx/media3/session/SessionToken.java b/libraries/session/src/main/java/androidx/media3/session/SessionToken.java
index ff8167ce1e..e3a087f776 100644
--- a/libraries/session/src/main/java/androidx/media3/session/SessionToken.java
+++ b/libraries/session/src/main/java/androidx/media3/session/SessionToken.java
@@ -399,7 +399,7 @@ public final class SessionToken implements Bundleable {
     try {
       return manager.getApplicationInfo(packageName, 0).uid;
     } catch (PackageManager.NameNotFoundException e) {
-      throw new IllegalArgumentException("Cannot find package " + packageName);
+      throw new IllegalArgumentException("Cannot find package " + packageName, e);
     }
   }