diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 577cd37167..63834978fd 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -6,6 +6,13 @@ ExoPlayer 2.x is a major rewrite that's still under development. We suggest
 following our [Medium page](https://medium.com/google-exoplayer) to learn more,
 as we work toward writing more complete documentation and the first 2.x release.
 
+### r1.5.10 ###
+
+* HLS: Stability fixes.
+* MP4: Support for stz2 Atoms.
+* Enable 4K format selection on Sony AndroidTV + nVidia SHIELD.
+* TX3G caption fixes.
+
 ### r1.5.9 ###
 
 * MP4: Fixed incorrect sniffing in some cases (#1523).
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 e83846d3b4..139bdd71d4 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 < 21.
+   * active across releasing/initializing a new audio track, on platform API version before 21.
    * <p>
    * The flag must be set before creating a player.
    */
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 38ffb92ec2..4c569bfe03 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
@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.metadata;
 
 /**
- * Decodes objects of type <T> from binary data.
+ * Decodes metadata from binary data.
  *
  * @param <T> The type of the metadata.
  */
diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
index 875e7395e8..77cdb1ac5d 100644
--- a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
+++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
@@ -54,7 +54,6 @@ import org.xmlpull.v1.XmlPullParserFactory;
  *   <li>time-offset-with-frames
  *   <li>time-offset-with-ticks
  * </ul>
- * </p>
  * @see <a href="http://www.w3.org/TR/ttaf1-dfxp/">TTML specification</a>
  */
 public final class TtmlDecoder extends SimpleSubtitleDecoder {
diff --git a/library/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/src/main/java/com/google/android/exoplayer2/util/Util.java
index 919445f955..008ffb429a 100644
--- a/library/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -746,8 +746,8 @@ public final class Util {
    * filesystems. FAT32 is the most restrictive of all filesystems still commonly used today.
    *
    * <p>For simplicity, this only handles common characters known to be illegal on FAT32:
-   * <, >, :, ", /, \, |, ?, and *. % is also escaped since it is used as the escape character.
-   * Escaping is performed in a consistent way so that no collisions occur and
+   * &lt;, &gt;, :, ", /, \, |, ?, and *. % is also escaped since it is used as the escape
+   * character. Escaping is performed in a consistent way so that no collisions occur and
    * {@link #unescapeFileName(String)} can be used to retrieve the original file name.
    *
    * @param fileName File name to be escaped.