diff --git a/libraries/common/src/main/java/androidx/media3/common/C.java b/libraries/common/src/main/java/androidx/media3/common/C.java
index 075569f2b8..d69a757a22 100644
--- a/libraries/common/src/main/java/androidx/media3/common/C.java
+++ b/libraries/common/src/main/java/androidx/media3/common/C.java
@@ -142,17 +142,11 @@ public final class C {
   @IntDef({CRYPTO_MODE_UNENCRYPTED, CRYPTO_MODE_AES_CTR, CRYPTO_MODE_AES_CBC})
   @UnstableApi
   public @interface CryptoMode {}
-  /**
-   * @see MediaCodec#CRYPTO_MODE_UNENCRYPTED
-   */
+  /** See {@link MediaCodec#CRYPTO_MODE_UNENCRYPTED}. */
   @UnstableApi public static final int CRYPTO_MODE_UNENCRYPTED = MediaCodec.CRYPTO_MODE_UNENCRYPTED;
-  /**
-   * @see MediaCodec#CRYPTO_MODE_AES_CTR
-   */
+  /** See {@link MediaCodec#CRYPTO_MODE_AES_CTR}. */
   @UnstableApi public static final int CRYPTO_MODE_AES_CTR = MediaCodec.CRYPTO_MODE_AES_CTR;
-  /**
-   * @see MediaCodec#CRYPTO_MODE_AES_CBC
-   */
+  /** See {@link MediaCodec#CRYPTO_MODE_AES_CBC}. */
   @UnstableApi public static final int CRYPTO_MODE_AES_CBC = MediaCodec.CRYPTO_MODE_AES_CBC;
 
   /**
@@ -222,17 +216,11 @@ public final class C {
     ENCODING_PCM_FLOAT
   })
   public @interface PcmEncoding {}
-  /**
-   * @see AudioFormat#ENCODING_INVALID
-   */
+  /** See {@link AudioFormat#ENCODING_INVALID}. */
   @UnstableApi public static final int ENCODING_INVALID = AudioFormat.ENCODING_INVALID;
-  /**
-   * @see AudioFormat#ENCODING_PCM_8BIT
-   */
+  /** See {@link AudioFormat#ENCODING_PCM_8BIT}. */
   @UnstableApi public static final int ENCODING_PCM_8BIT = AudioFormat.ENCODING_PCM_8BIT;
-  /**
-   * @see AudioFormat#ENCODING_PCM_16BIT
-   */
+  /** See {@link AudioFormat#ENCODING_PCM_16BIT}. */
   @UnstableApi public static final int ENCODING_PCM_16BIT = AudioFormat.ENCODING_PCM_16BIT;
   /** Like {@link #ENCODING_PCM_16BIT}, but with the bytes in big endian order. */
   @UnstableApi public static final int ENCODING_PCM_16BIT_BIG_ENDIAN = 0x10000000;
@@ -240,67 +228,37 @@ public final class C {
   @UnstableApi public static final int ENCODING_PCM_24BIT = 0x20000000;
   /** PCM encoding with 32 bits per sample. */
   @UnstableApi public static final int ENCODING_PCM_32BIT = 0x30000000;
-  /**
-   * @see AudioFormat#ENCODING_PCM_FLOAT
-   */
+  /** See {@link AudioFormat#ENCODING_PCM_FLOAT}. */
   @UnstableApi public static final int ENCODING_PCM_FLOAT = AudioFormat.ENCODING_PCM_FLOAT;
-  /**
-   * @see AudioFormat#ENCODING_MP3
-   */
+  /** See {@link AudioFormat#ENCODING_MP3}. */
   @UnstableApi public static final int ENCODING_MP3 = AudioFormat.ENCODING_MP3;
-  /**
-   * @see AudioFormat#ENCODING_AAC_LC
-   */
+  /** See {@link AudioFormat#ENCODING_AAC_LC}. */
   @UnstableApi public static final int ENCODING_AAC_LC = AudioFormat.ENCODING_AAC_LC;
-  /**
-   * @see AudioFormat#ENCODING_AAC_HE_V1
-   */
+  /** See {@link AudioFormat#ENCODING_AAC_HE_V1}. */
   @UnstableApi public static final int ENCODING_AAC_HE_V1 = AudioFormat.ENCODING_AAC_HE_V1;
-  /**
-   * @see AudioFormat#ENCODING_AAC_HE_V2
-   */
+  /** See {@link AudioFormat#ENCODING_AAC_HE_V2}. */
   @UnstableApi public static final int ENCODING_AAC_HE_V2 = AudioFormat.ENCODING_AAC_HE_V2;
-  /**
-   * @see AudioFormat#ENCODING_AAC_XHE
-   */
+  /** See {@link AudioFormat#ENCODING_AAC_XHE}. */
   @UnstableApi public static final int ENCODING_AAC_XHE = AudioFormat.ENCODING_AAC_XHE;
-  /**
-   * @see AudioFormat#ENCODING_AAC_ELD
-   */
+  /** See {@link AudioFormat#ENCODING_AAC_ELD}. */
   @UnstableApi public static final int ENCODING_AAC_ELD = AudioFormat.ENCODING_AAC_ELD;
   /** AAC Error Resilient Bit-Sliced Arithmetic Coding. */
   @UnstableApi public static final int ENCODING_AAC_ER_BSAC = 0x40000000;
-  /**
-   * @see AudioFormat#ENCODING_AC3
-   */
+  /** See {@link AudioFormat#ENCODING_AC3}. */
   @UnstableApi public static final int ENCODING_AC3 = AudioFormat.ENCODING_AC3;
-  /**
-   * @see AudioFormat#ENCODING_E_AC3
-   */
+  /** See {@link AudioFormat#ENCODING_E_AC3}. */
   @UnstableApi public static final int ENCODING_E_AC3 = AudioFormat.ENCODING_E_AC3;
-  /**
-   * @see AudioFormat#ENCODING_E_AC3_JOC
-   */
+  /** See {@link AudioFormat#ENCODING_E_AC3_JOC}. */
   @UnstableApi public static final int ENCODING_E_AC3_JOC = AudioFormat.ENCODING_E_AC3_JOC;
-  /**
-   * @see AudioFormat#ENCODING_AC4
-   */
+  /** See {@link AudioFormat#ENCODING_AC4}. */
   @UnstableApi public static final int ENCODING_AC4 = AudioFormat.ENCODING_AC4;
-  /**
-   * @see AudioFormat#ENCODING_DTS
-   */
+  /** See {@link AudioFormat#ENCODING_DTS}. */
   @UnstableApi public static final int ENCODING_DTS = AudioFormat.ENCODING_DTS;
-  /**
-   * @see AudioFormat#ENCODING_DTS_HD
-   */
+  /** See {@link AudioFormat#ENCODING_DTS_HD}. */
   @UnstableApi public static final int ENCODING_DTS_HD = AudioFormat.ENCODING_DTS_HD;
-  /**
-   * @see AudioFormat#ENCODING_DOLBY_TRUEHD
-   */
+  /** See {@link AudioFormat#ENCODING_DOLBY_TRUEHD}. */
   @UnstableApi public static final int ENCODING_DOLBY_TRUEHD = AudioFormat.ENCODING_DOLBY_TRUEHD;
-  /**
-   * @see AudioFormat#ENCODING_OPUS
-   */
+  /** See {@link AudioFormat#ENCODING_OPUS}. */
   @UnstableApi public static final int ENCODING_OPUS = AudioFormat.ENCODING_OPUS;
 
   /**
@@ -313,14 +271,10 @@ public final class C {
   @IntDef({SPATIALIZATION_BEHAVIOR_AUTO, SPATIALIZATION_BEHAVIOR_NEVER})
   public @interface SpatializationBehavior {}
 
-  /**
-   * @see AudioAttributes#SPATIALIZATION_BEHAVIOR_AUTO
-   */
+  /** See {@link AudioAttributes#SPATIALIZATION_BEHAVIOR_AUTO}. */
   public static final int SPATIALIZATION_BEHAVIOR_AUTO =
       AudioAttributes.SPATIALIZATION_BEHAVIOR_AUTO;
-  /**
-   * @see AudioAttributes#SPATIALIZATION_BEHAVIOR_NEVER
-   */
+  /** See {@link AudioAttributes#SPATIALIZATION_BEHAVIOR_NEVER}. */
   public static final int SPATIALIZATION_BEHAVIOR_NEVER =
       AudioAttributes.SPATIALIZATION_BEHAVIOR_NEVER;
 
@@ -348,33 +302,19 @@ public final class C {
     STREAM_TYPE_DEFAULT
   })
   public @interface StreamType {}
-  /**
-   * @see AudioManager#STREAM_ALARM
-   */
+  /** See {@link AudioManager#STREAM_ALARM}. */
   @UnstableApi public static final int STREAM_TYPE_ALARM = AudioManager.STREAM_ALARM;
-  /**
-   * @see AudioManager#STREAM_DTMF
-   */
+  /** See {@link AudioManager#STREAM_DTMF}. */
   @UnstableApi public static final int STREAM_TYPE_DTMF = AudioManager.STREAM_DTMF;
-  /**
-   * @see AudioManager#STREAM_MUSIC
-   */
+  /** See {@link AudioManager#STREAM_MUSIC}. */
   @UnstableApi public static final int STREAM_TYPE_MUSIC = AudioManager.STREAM_MUSIC;
-  /**
-   * @see AudioManager#STREAM_NOTIFICATION
-   */
+  /** See {@link AudioManager#STREAM_NOTIFICATION}. */
   @UnstableApi public static final int STREAM_TYPE_NOTIFICATION = AudioManager.STREAM_NOTIFICATION;
-  /**
-   * @see AudioManager#STREAM_RING
-   */
+  /** See {@link AudioManager#STREAM_RING}. */
   @UnstableApi public static final int STREAM_TYPE_RING = AudioManager.STREAM_RING;
-  /**
-   * @see AudioManager#STREAM_SYSTEM
-   */
+  /** See {@link AudioManager#STREAM_SYSTEM}. */
   @UnstableApi public static final int STREAM_TYPE_SYSTEM = AudioManager.STREAM_SYSTEM;
-  /**
-   * @see AudioManager#STREAM_VOICE_CALL
-   */
+  /** See {@link AudioManager#STREAM_VOICE_CALL}. */
   @UnstableApi public static final int STREAM_TYPE_VOICE_CALL = AudioManager.STREAM_VOICE_CALL;
   /** The default stream type used by audio renderers. Equal to {@link #STREAM_TYPE_MUSIC}. */
   @UnstableApi public static final int STREAM_TYPE_DEFAULT = STREAM_TYPE_MUSIC;
@@ -483,9 +423,7 @@ public final class C {
       flag = true,
       value = {FLAG_AUDIBILITY_ENFORCED})
   public @interface AudioFlags {}
-  /**
-   * @see android.media.AudioAttributes#FLAG_AUDIBILITY_ENFORCED
-   */
+  /** See {@link android.media.AudioAttributes#FLAG_AUDIBILITY_ENFORCED}. */
   public static final int FLAG_AUDIBILITY_ENFORCED =
       android.media.AudioAttributes.FLAG_AUDIBILITY_ENFORCED;
 
@@ -523,78 +461,46 @@ public final class C {
     USAGE_VOICE_COMMUNICATION_SIGNALLING
   })
   public @interface AudioUsage {}
-  /**
-   * @see android.media.AudioAttributes#USAGE_ALARM
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_ALARM}. */
   public static final int USAGE_ALARM = android.media.AudioAttributes.USAGE_ALARM;
-  /**
-   * @see android.media.AudioAttributes#USAGE_ASSISTANCE_ACCESSIBILITY
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_ASSISTANCE_ACCESSIBILITY}. */
   public static final int USAGE_ASSISTANCE_ACCESSIBILITY =
       android.media.AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY;
-  /**
-   * @see android.media.AudioAttributes#USAGE_ASSISTANCE_NAVIGATION_GUIDANCE
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_ASSISTANCE_NAVIGATION_GUIDANCE}. */
   public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE =
       android.media.AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE;
-  /**
-   * @see android.media.AudioAttributes#USAGE_ASSISTANCE_SONIFICATION
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_ASSISTANCE_SONIFICATION}. */
   public static final int USAGE_ASSISTANCE_SONIFICATION =
       android.media.AudioAttributes.USAGE_ASSISTANCE_SONIFICATION;
-  /**
-   * @see android.media.AudioAttributes#USAGE_ASSISTANT
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_ASSISTANT}. */
   public static final int USAGE_ASSISTANT = android.media.AudioAttributes.USAGE_ASSISTANT;
-  /**
-   * @see android.media.AudioAttributes#USAGE_GAME
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_GAME}. */
   public static final int USAGE_GAME = android.media.AudioAttributes.USAGE_GAME;
-  /**
-   * @see android.media.AudioAttributes#USAGE_MEDIA
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_MEDIA}. */
   public static final int USAGE_MEDIA = android.media.AudioAttributes.USAGE_MEDIA;
-  /**
-   * @see android.media.AudioAttributes#USAGE_NOTIFICATION
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_NOTIFICATION}. */
   public static final int USAGE_NOTIFICATION = android.media.AudioAttributes.USAGE_NOTIFICATION;
-  /**
-   * @see android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_DELAYED
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_DELAYED}. */
   public static final int USAGE_NOTIFICATION_COMMUNICATION_DELAYED =
       android.media.AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_DELAYED;
-  /**
-   * @see android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_INSTANT
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_INSTANT}. */
   public static final int USAGE_NOTIFICATION_COMMUNICATION_INSTANT =
       android.media.AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT;
-  /**
-   * @see android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_REQUEST
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_REQUEST}. */
   public static final int USAGE_NOTIFICATION_COMMUNICATION_REQUEST =
       android.media.AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST;
-  /**
-   * @see android.media.AudioAttributes#USAGE_NOTIFICATION_EVENT
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_NOTIFICATION_EVENT}. */
   public static final int USAGE_NOTIFICATION_EVENT =
       android.media.AudioAttributes.USAGE_NOTIFICATION_EVENT;
-  /**
-   * @see android.media.AudioAttributes#USAGE_NOTIFICATION_RINGTONE
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_NOTIFICATION_RINGTONE}. */
   public static final int USAGE_NOTIFICATION_RINGTONE =
       android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
-  /**
-   * @see android.media.AudioAttributes#USAGE_UNKNOWN
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_UNKNOWN}. */
   public static final int USAGE_UNKNOWN = android.media.AudioAttributes.USAGE_UNKNOWN;
-  /**
-   * @see android.media.AudioAttributes#USAGE_VOICE_COMMUNICATION
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_VOICE_COMMUNICATION}. */
   public static final int USAGE_VOICE_COMMUNICATION =
       android.media.AudioAttributes.USAGE_VOICE_COMMUNICATION;
-  /**
-   * @see android.media.AudioAttributes#USAGE_VOICE_COMMUNICATION_SIGNALLING
-   */
+  /** See {@link android.media.AudioAttributes#USAGE_VOICE_COMMUNICATION_SIGNALLING}. */
   public static final int USAGE_VOICE_COMMUNICATION_SIGNALLING =
       android.media.AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING;
 
@@ -1066,17 +972,11 @@ public final class C {
   @Target(TYPE_USE)
   @IntDef({Format.NO_VALUE, COLOR_SPACE_BT601, COLOR_SPACE_BT709, COLOR_SPACE_BT2020})
   public @interface ColorSpace {}
-  /**
-   * @see MediaFormat#COLOR_STANDARD_BT601_PAL
-   */
+  /** See {@link MediaFormat#COLOR_STANDARD_BT601_PAL}. */
   @UnstableApi public static final int COLOR_SPACE_BT601 = MediaFormat.COLOR_STANDARD_BT601_PAL;
-  /**
-   * @see MediaFormat#COLOR_STANDARD_BT709
-   */
+  /** See {@link MediaFormat#COLOR_STANDARD_BT709}. */
   @UnstableApi public static final int COLOR_SPACE_BT709 = MediaFormat.COLOR_STANDARD_BT709;
-  /**
-   * @see MediaFormat#COLOR_STANDARD_BT2020
-   */
+  /** See {@link MediaFormat#COLOR_STANDARD_BT2020}. */
   @UnstableApi public static final int COLOR_SPACE_BT2020 = MediaFormat.COLOR_STANDARD_BT2020;
 
   // LINT.IfChange(color_transfer)
@@ -1131,13 +1031,9 @@ public final class C {
   @Target(TYPE_USE)
   @IntDef({Format.NO_VALUE, COLOR_RANGE_LIMITED, COLOR_RANGE_FULL})
   public @interface ColorRange {}
-  /**
-   * @see MediaFormat#COLOR_RANGE_LIMITED
-   */
+  /** See {@link MediaFormat#COLOR_RANGE_LIMITED}. */
   @UnstableApi public static final int COLOR_RANGE_LIMITED = MediaFormat.COLOR_RANGE_LIMITED;
-  /**
-   * @see MediaFormat#COLOR_RANGE_FULL
-   */
+  /** See {@link MediaFormat#COLOR_RANGE_FULL}. */
   @UnstableApi public static final int COLOR_RANGE_FULL = MediaFormat.COLOR_RANGE_FULL;
 
   /**