diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ea7dc48d12d..5672cce75ed 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -13,6 +13,8 @@
         and nullable array element types are not detected as nullable. Examples
         are `TrackSelectorResult` and `SimpleDecoder` method parameters
         ([6792](https://github.com/google/ExoPlayer/issues/6792)).
+    *   Remove accidentally added `multidex` dependency from all modules
+        ([#499](https://github.com/androidx/media/issues/499)).
 *   ExoPlayer:
     *   Add suppression of playback on unsuitable audio output devices (e.g. the
         built-in speaker on Wear OS devices) when this feature is enabled via
diff --git a/common_library_config.gradle b/common_library_config.gradle
index b2f7afab0d2..7dee4b3d202 100644
--- a/common_library_config.gradle
+++ b/common_library_config.gradle
@@ -43,6 +43,6 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }