diff --git a/library/common/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java b/library/common/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
index 3c1427a2ec..e296d013d5 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
@@ -27,6 +27,7 @@ import androidx.annotation.IntRange;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Bundleable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -52,8 +53,8 @@ public final class AdPlaybackState implements Bundleable {
   public static final class AdGroup implements Bundleable {
 
     /**
-     * The time of the ad group in the {@link com.google.android.exoplayer2.Timeline.Period}, in
-     * microseconds, or {@link C#TIME_END_OF_SOURCE} to indicate a postroll ad.
+     * The time of the ad group in the {@link Timeline.Period}, in microseconds, or {@link
+     * C#TIME_END_OF_SOURCE} to indicate a postroll ad.
      */
     public final long timeUs;
     /** The number of ads in the ad group, or {@link C#LENGTH_UNSET} if unknown. */
@@ -75,9 +76,8 @@ public final class AdPlaybackState implements Bundleable {
     /**
      * Creates a new ad group with an unspecified number of ads.
      *
-     * @param timeUs The time of the ad group in the {@link
-     *     com.google.android.exoplayer2.Timeline.Period}, in microseconds, or {@link
-     *     C#TIME_END_OF_SOURCE} to indicate a postroll ad.
+     * @param timeUs The time of the ad group in the {@link Timeline.Period}, in microseconds, or
+     *     {@link C#TIME_END_OF_SOURCE} to indicate a postroll ad.
      */
     public AdGroup(long timeUs) {
       this(
@@ -452,8 +452,8 @@ public final class AdPlaybackState implements Bundleable {
    *
    * @param adsId The opaque identifier for ads with which this instance is associated.
    * @param adGroupTimesUs The times of ad groups in microseconds, relative to the start of the
-   *     {@link com.google.android.exoplayer2.Timeline.Period} they belong to. A final element with
-   *     the value {@link C#TIME_END_OF_SOURCE} indicates that there is a postroll ad.
+   *     {@link Timeline.Period} they belong to. A final element with the value {@link
+   *     C#TIME_END_OF_SOURCE} indicates that there is a postroll ad.
    */
   public AdPlaybackState(Object adsId, long... adGroupTimesUs) {
     this(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
index 74c78b1af3..29b6896e18 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.audio;
 
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Assertions;
 import java.nio.ByteBuffer;
 
@@ -33,9 +34,10 @@ import java.nio.ByteBuffer;
    * Resets the channel mapping. After calling this method, call {@link #configure(AudioFormat)} to
    * start using the new channel map.
    *
+   * <p>See {@link AudioSink#configure(Format, int, int[])}.
+   *
    * @param outputChannels The mapping from input to output channel indices, or {@code null} to
    *     leave the input unchanged.
-   * @see AudioSink#configure(com.google.android.exoplayer2.Format, int, int[])
    */
   public void setChannelMap(@Nullable int[] outputChannels) {
     pendingOutputChannels = outputChannels;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
index bd3017bf53..019c541f6d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.audio;
 import static java.lang.Math.min;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Util;
 import java.nio.ByteBuffer;
 
@@ -45,9 +46,10 @@ import java.nio.ByteBuffer;
    * processor. After calling this method, call {@link #configure(AudioFormat)} to apply the new
    * trimming frame counts.
    *
+   * <p>See {@link AudioSink#configure(Format, int, int[])}.
+   *
    * @param trimStartFrames The number of audio frames to trim from the start of audio.
    * @param trimEndFrames The number of audio frames to trim from the end of audio.
-   * @see AudioSink#configure(com.google.android.exoplayer2.Format, int, int[])
    */
   public void setTrimFrameCount(int trimStartFrames, int trimEndFrames) {
     this.trimStartFrames = trimStartFrames;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
index 2117883f4d..fe039f9d16 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source;
 
 import android.os.Handler;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.drm.DrmSessionEventListener;
@@ -25,8 +26,8 @@ import com.google.android.exoplayer2.upstream.TransferListener;
 import java.io.IOException;
 
 /**
- * Defines and provides media to be played by an {@link com.google.android.exoplayer2.ExoPlayer}. A
- * MediaSource has two main responsibilities:
+ * Defines and provides media to be played by an {@link ExoPlayer}. A MediaSource has two main
+ * responsibilities:
  *
  * <ul>
  *   <li>To provide the player with a {@link Timeline} defining the structure of its media, and to
@@ -40,9 +41,8 @@ import java.io.IOException;
  * </ul>
  *
  * All methods are called on the player's internal playback thread, as described in the {@link
- * com.google.android.exoplayer2.ExoPlayer} Javadoc. They should not be called directly from
- * application code. Instances can be re-used, but only for one {@link
- * com.google.android.exoplayer2.ExoPlayer} instance simultaneously.
+ * ExoPlayer} Javadoc. They should not be called directly from application code. Instances can be
+ * re-used, but only for one {@link ExoPlayer} instance simultaneously.
  */
 public interface MediaSource {
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
index dbd3349ccc..41df5c6891 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.SeekParameters;
+import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
@@ -56,9 +57,8 @@ public final class SilenceMediaSource extends BaseMediaSource {
     }
 
     /**
-     * Sets a tag for the media source which will be published in the {@link
-     * com.google.android.exoplayer2.Timeline} of the source as {@link
-     * MediaItem.LocalConfiguration#tag Window#mediaItem.localConfiguration.tag}.
+     * Sets a tag for the media source which will be published in the {@link Timeline} of the source
+     * as {@link MediaItem.LocalConfiguration#tag Window#mediaItem.localConfiguration.tag}.
      *
      * @param tag A tag for the media source.
      * @return This factory, for convenience.
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
index a12cbeb805..4f07aa3d9d 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
@@ -124,7 +124,7 @@ public final class DashUtil {
    * Loads initialization data for the {@code representation} and returns the sample {@link Format}.
    *
    * @param dataSource The source from which the data should be loaded.
-   * @param trackType The type of the representation. Typically one of the {@link
+   * @param trackType The type of the representation. Typically one of the {@link C
    *     com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
    * @param representation The representation which initialization chunk belongs to.
    * @param baseUrlIndex The index of the base URL to be picked from the {@link
@@ -155,7 +155,7 @@ public final class DashUtil {
    * <p>Uses the first base URL for loading the format.
    *
    * @param dataSource The source from which the data should be loaded.
-   * @param trackType The type of the representation. Typically one of the {@link
+   * @param trackType The type of the representation. Typically one of the {@link C
    *     com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
    * @param representation The representation which initialization chunk belongs to.
    * @return the sample {@link Format} of the given representation.
@@ -172,7 +172,7 @@ public final class DashUtil {
    * ChunkIndex}.
    *
    * @param dataSource The source from which the data should be loaded.
-   * @param trackType The type of the representation. Typically one of the {@link
+   * @param trackType The type of the representation. Typically one of the {@link C
    *     com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
    * @param representation The representation which initialization chunk belongs to.
    * @param baseUrlIndex The index of the base URL with which to resolve the request URI.
@@ -204,7 +204,7 @@ public final class DashUtil {
    * <p>Uses the first base URL for loading the index.
    *
    * @param dataSource The source from which the data should be loaded.
-   * @param trackType The type of the representation. Typically one of the {@link
+   * @param trackType The type of the representation. Typically one of the {@link C
    *     com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
    * @param representation The representation which initialization chunk belongs to.
    * @return The {@link ChunkIndex} of the given representation, or null if no initialization or
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
index b0e3f3f15e..0d50c3f709 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
@@ -350,8 +350,7 @@ public final class Cea608Decoder extends CeaDecoder {
    * Constructs an instance.
    *
    * @param mimeType The MIME type of the CEA-608 data.
-   * @param accessibilityChannel The Accessibility channel, or {@link
-   *     com.google.android.exoplayer2.Format#NO_VALUE} if unknown.
+   * @param accessibilityChannel The Accessibility channel, or {@link Format#NO_VALUE} if unknown.
    * @param validDataChannelTimeoutMs The timeout (in milliseconds) permitted by ANSI/CTA-608-E
    *     R-2014 Annex C.9 to clear "stuck" captions where no removal control code is received. The
    *     timeout should be at least {@link #MIN_DATA_CHANNEL_TIMEOUT_MS} or {@link C#TIME_UNSET} for
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java b/library/extractor/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java
index 376e593ee6..31dce7119b 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java
@@ -85,7 +85,7 @@ public final class AvcConfig {
   /**
    * List of buffers containing the codec-specific data to be provided to the decoder.
    *
-   * @see com.google.android.exoplayer2.Format#initializationData
+   * <p>See {@link Format#initializationData}.
    */
   public final List<byte[]> initializationData;
 
@@ -104,7 +104,7 @@ public final class AvcConfig {
   /**
    * An RFC 6381 codecs string representing the video format, or {@code null} if not known.
    *
-   * @see com.google.android.exoplayer2.Format#codecs
+   * <p>See {@link Format#codecs}.
    */
   @Nullable public final String codecs;
 
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java b/library/extractor/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
index cb0b6c542c..7e688b2e42 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
@@ -111,7 +111,7 @@ public final class HevcConfig {
   /**
    * List of buffers containing the codec-specific data to be provided to the decoder.
    *
-   * @see com.google.android.exoplayer2.Format#initializationData
+   * <p>See {@link Format#initializationData}.
    */
   public final List<byte[]> initializationData;
 
@@ -130,7 +130,7 @@ public final class HevcConfig {
   /**
    * An RFC 6381 codecs string representing the video format, or {@code null} if not known.
    *
-   * @see com.google.android.exoplayer2.Format#codecs
+   * <p>See {@link Format#codecs}.
    */
   @Nullable public final String codecs;
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 7035372b32..9ebefcdcda 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -51,6 +51,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ControlDispatcher;
+import com.google.android.exoplayer2.DefaultControlDispatcher;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.ForwardingPlayer;
@@ -322,7 +323,7 @@ public class PlayerControlView extends FrameLayout {
   private final String shuffleOffContentDescription;
 
   @Nullable private Player player;
-  private com.google.android.exoplayer2.ControlDispatcher controlDispatcher;
+  private ControlDispatcher controlDispatcher;
   @Nullable private ProgressUpdateListener progressUpdateListener;
 
   private boolean isAttachedToWindow;
@@ -419,7 +420,7 @@ public class PlayerControlView extends FrameLayout {
     extraAdGroupTimesMs = new long[0];
     extraPlayedAdGroups = new boolean[0];
     componentListener = new ComponentListener();
-    controlDispatcher = new com.google.android.exoplayer2.DefaultControlDispatcher();
+    controlDispatcher = new DefaultControlDispatcher();
     updateProgressAction = this::updateProgress;
     hideAction = this::hide;
 
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
index 682de8d56c..d3cd7fccaf 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
@@ -26,6 +26,7 @@ import android.view.Surface;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.LoadControl;
 import com.google.android.exoplayer2.MediaItem;
@@ -178,10 +179,9 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
     }
 
     /**
-     * Skips calling {@link com.google.android.exoplayer2.ExoPlayer#setMediaSources(List)} before
-     * preparing. Calling this method is not allowed after calls to {@link
-     * #setMediaSources(MediaSource...)}, {@link #setTimeline(Timeline)} and/or {@link
-     * #setManifest(Object)}.
+     * Skips calling {@link ExoPlayer#setMediaSources(List)} before preparing. Calling this method
+     * is not allowed after calls to {@link #setMediaSources(MediaSource...)}, {@link
+     * #setTimeline(Timeline)} and/or {@link #setManifest(Object)}.
      *
      * @return This builder.
      */