diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java
index a3e6c1ca53..cb3927d9e6 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java
@@ -140,7 +140,7 @@ import java.nio.ByteBuffer;
   }
 
   /**
-   * @return The position of the next data to be decoded or -1 in case of error.
+   * Returns the position of the next data to be decoded, or -1 in case of error.
    */
   public long getDecodePosition() {
     return flacGetDecodePosition(nativeDecoderContext);
diff --git a/library/src/main/java/com/google/android/exoplayer2/Format.java b/library/src/main/java/com/google/android/exoplayer2/Format.java
index a92a9b236d..0f780c8769 100644
--- a/library/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/src/main/java/com/google/android/exoplayer2/Format.java
@@ -411,7 +411,7 @@ public final class Format implements Parcelable {
   }
 
   /**
-   * @return A {@link MediaFormat} representation of this format.
+   * Returns a {@link MediaFormat} representation of this format.
    */
   @SuppressLint("InlinedApi")
   @TargetApi(16)
diff --git a/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 9ba15007b3..2c6cb16e93 100644
--- a/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -232,40 +232,35 @@ public final class SimpleExoPlayer implements ExoPlayer {
   }
 
   /**
-   * @return The video format currently being played, or null if there is no video component to the
-   *     current media.
+   * Returns the video format currently being played, or null if no video is being played.
    */
   public Format getVideoFormat() {
     return videoFormat;
   }
 
   /**
-   * @return The audio format currently being played, or null if there is no audio component to the
-   *     current media.
+   * Returns the audio format currently being played, or null if no audio is being played.
    */
   public Format getAudioFormat() {
     return audioFormat;
   }
 
   /**
-   * @return The audio session identifier. If not set {@code AudioTrack.SESSION_ID_NOT_SET} is
-   *     returned.
+   * Returns the audio session identifier, or {@code AudioTrack.SESSION_ID_NOT_SET} if not set.
    */
   public int getAudioSessionId() {
     return audioSessionId;
   }
 
   /**
-   * @return The {@link DecoderCounters} for video, or null if there is no video component to the
-   *     current media.
+   * Returns {@link DecoderCounters} for video, or null if no video is being played.
    */
   public DecoderCounters getVideoDecoderCounters() {
     return videoDecoderCounters;
   }
 
   /**
-   * @return The {@link DecoderCounters} for audio, or null if there is no audio component to the
-   *     current media.
+   * Returns {@link DecoderCounters} for audio, or null if no audio is being played.
    */
   public DecoderCounters getAudioDecoderCounters() {
     return audioDecoderCounters;
diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
index 06bce66e04..04b8b42375 100644
--- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
+++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
@@ -111,7 +111,7 @@ import java.io.IOException;
   }
 
   /**
-   * @return A ParsableByteArray containing the payload of the packet.
+   * Returns a {@link ParsableByteArray} containing the packet's payload.
    */
   public ParsableByteArray getPayload() {
     return packetArray;
diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
index 34dd4f89bd..693e56c197 100644
--- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
+++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
@@ -27,9 +27,8 @@ import java.io.IOException;
 /* package */ interface OggSeeker {
 
   /**
-   * @return a SeekMap instance which returns an initial estimated position for progressive seeking
-   *     or the final position for direct seeking. Returns null if {@link #read} hasn't returned -1
-   *     yet.
+   * Returns a {@link SeekMap} that returns an initial estimated position for progressive seeking
+   * or the final position for direct seeking. Returns null if {@link #read} has yet to return -1.
    */
   SeekMap createSeekMap();
 
diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index e6262321ee..0a5dc055ba 100644
--- a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -380,7 +380,7 @@ public final class MediaCodecUtil {
     android.media.MediaCodecInfo getCodecInfoAt(int index);
 
     /**
-     * @return Returns whether secure decoders are explicitly listed, if present.
+     * Returns whether secure decoders are explicitly listed, if present.
      */
     boolean secureDecodersExplicit();
 
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
index 97022b463b..3be8b1a4a0 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
@@ -150,8 +150,8 @@ public final class FakeDataSource implements DataSource {
   }
 
   /**
-   * @return The {@link DataSpec} instances passed to {@link #open(DataSpec)} since the last call
-   *     to this method.
+   * Returns the {@link DataSpec} instances passed to {@link #open(DataSpec)} since the last call to
+   * this method.
    */
   public DataSpec[] getAndClearOpenedDataSpecs() {
     DataSpec[] dataSpecs = new DataSpec[openedDataSpecs.size()];