diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 60ce036861..20cc39b854 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,10 +2,7 @@
 
 ### dev-v2 (not yet released) ###
 
-* Added dependency on checkerframework annotations for static code analysis.
-* IMA: Expose ad load errors via `MediaSourceEventListener` on `AdsMediaSource`,
-  and allow setting an ad event listener on `ImaAdsLoader`. Deprecate the
-  `AdsMediaSource.EventListener`.
+* Coming soon...
 
 ### 2.8.0 ###
 
@@ -82,8 +79,12 @@
     ([#4164](https://github.com/google/ExoPlayer/issues/4182)).
   * Fix seeking in live streams
     ([#4187](https://github.com/google/ExoPlayer/issues/4187)).
-* IMA: Allow setting the ad media load timeout
-  ([#3691](https://github.com/google/ExoPlayer/issues/3691)).
+* IMA:
+  * Allow setting the ad media load timeout
+    ([#3691](https://github.com/google/ExoPlayer/issues/3691)).
+  * Expose ad load errors via `MediaSourceEventListener` on `AdsMediaSource`,
+    and allow setting an ad event listener on `ImaAdsLoader`. Deprecate the
+    `AdsMediaSource.EventListener`.
 * Add `AnalyticsListener` interface which can be registered in
   `SimpleExoPlayer` to receive detailed metadata for each ExoPlayer event.
 * Optimize seeking in FMP4 by enabling seeking to the nearest sync sample within
@@ -101,6 +102,7 @@
 * Removed default renderer time offset of 60000000 from internal player. The
   actual renderer timestamp offset can be obtained by listening to
   `BaseRenderer.onStreamChanged`.
+* Added dependencies on checkerframework annotations for static code analysis.
 
 ### 2.7.3 ###
 
diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index fc4f1c5998..b9fb3a63cc 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -35,7 +35,6 @@ android {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    implementation 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
index 67c61fe06d..47e2650bec 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
@@ -130,6 +130,7 @@ public class DashManifest implements FilterableManifest<DashManifest, Representa
    * @return A copy of this manifest with the selected representations.
    * @throws IndexOutOfBoundsException If a key has an invalid index.
    */
+  @Override
   public final DashManifest copy(List<RepresentationKey> representationKeys) {
     LinkedList<RepresentationKey> keys = new LinkedList<>(representationKeys);
     Collections.sort(keys);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
index 1e27855357..ae55c539c9 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
@@ -115,6 +115,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist<HlsMasterPlaylist> {
    * @return A copy of this playlist which includes only the renditions identified by the given
    *     urls.
    */
+  @Override
   public HlsMasterPlaylist copy(List<RenditionKey> renditionKeys) {
     return new HlsMasterPlaylist(
         baseUri,