diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index ea3b8ec81e..6044954693 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -56,7 +56,7 @@ import com.google.android.exoplayer2.source.MediaSource;
  * <p>The figure below shows the {@link ExoPlayer} threading model.</p>
  * <p align="center"><img src="doc-files/exoplayer-threading-model.png"
  *     alt="MediaPlayer state diagram"
- *     border="0"/></p>
+ *     border="0"></p>
  *
  * <ul>
  * <li>It is recommended that instances are created and accessed from a single application thread.
@@ -84,14 +84,14 @@ import com.google.android.exoplayer2.source.MediaSource;
  *
  * <p align="center"><img src="doc-files/exoplayer-state.png"
  *     alt="ExoPlayer state"
- *     border="0"/></p>
+ *     border="0"></p>
  *
  * <p>The possible playback state transitions are shown below. Transitions can be triggered either
  * by changes in the state of the {@link Renderer}s being used, or as a result of
  * {@link #setMediaSource(MediaSource)}, {@link #stop()} or {@link #release()} being called.</p>
  * <p align="center"><img src="doc-files/exoplayer-playbackstate.png"
  *     alt="ExoPlayer playback state transitions"
- *     border="0"/></p>
+ *     border="0"></p>
  */
 public interface ExoPlayer {
 
diff --git a/library/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/src/main/java/com/google/android/exoplayer2/Renderer.java
index f4f95b2fad..0074d7c0c3 100644
--- a/library/src/main/java/com/google/android/exoplayer2/Renderer.java
+++ b/library/src/main/java/com/google/android/exoplayer2/Renderer.java
@@ -29,7 +29,7 @@ import java.io.IOException;
  * transition.
  * <p align="center"><img src="doc-files/renderer-states.png"
  *     alt="Renderer state transitions"
- *     border="0"/></p>
+ *     border="0"></p>
  */
 public interface Renderer extends ExoPlayerComponent {
 
diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
index e634059d00..1a2e4b3064 100644
--- a/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
+++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
@@ -178,7 +178,7 @@ public final class AudioTrack {
 
   /**
    * Whether to enable a workaround for an issue where an audio effect does not keep its session
-   * active across releasing/initializing a new audio track, on platform API version before 21.
+   * active across releasing/initializing a new audio track, on platform API version &lt; 21.
    * <p>
    * The flag must be set before creating a player.
    */
@@ -679,10 +679,10 @@ public final class AudioTrack {
   }
 
   /**
-   * Sets the playback parameters. Only available for SDK_INT >= 23
+   * Sets the playback parameters. Only available for SDK_INT &gt;= 23
    *
    * @throws UnsupportedOperationException if the Playback Parameters are not supported. That is,
-   *     SDK_INT < 23.
+   *     SDK_INT &lt; 23.
    */
   public void setPlaybackParams(PlaybackParams playbackParams) {
     audioTrackUtil.setPlaybackParameters(playbackParams);
@@ -1216,7 +1216,7 @@ public final class AudioTrack {
      *
      * @param playbackParams to be used by the {@link android.media.AudioTrack}.
      * @throws UnsupportedOperationException If Playback Parameters are not supported
-     *     (i.e. SDK_INT < 23).
+     *     (i.e. SDK_INT &lt; 23).
      */
     public void setPlaybackParameters(PlaybackParams playbackParams) {
       throw new UnsupportedOperationException();
diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java b/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
index 4c569bfe03..ae977df507 100644
--- a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
+++ b/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
@@ -31,11 +31,11 @@ public interface MetadataDecoder<T> {
   boolean canDecode(String mimeType);
 
   /**
-   * Decodes metadata objects of type <T> from the provided binary data.
+   * Decodes metadata object from the provided binary data.
    *
    * @param data The raw binary data from which to decode the metadata.
    * @param size The size of the input data.
-   * @return @return A decoded metadata object of type <T>.
+   * @return @return A decoded metadata object.
    * @throws MetadataDecoderException If a problem occurred decoding the data.
    */
   T decode(byte[] data, int size) throws MetadataDecoderException;