diff --git a/MediaServiceCore b/MediaServiceCore
index 34955f781..a74df5670 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit 34955f7818084d7b70f7bdbec093707068a4c24c
+Subproject commit a74df5670525ed49227df24a958ae8e4a651c245
diff --git a/SharedModules b/SharedModules
index 90a5be623..c180ed8ef 160000
--- a/SharedModules
+++ b/SharedModules
@@ -1 +1 @@
-Subproject commit 90a5be6233a5f219d21307503fa201820ed21f7c
+Subproject commit c180ed8efaccef4a2ce5a9fe6fc8ac212467972e
diff --git a/build.gradle b/build.gradle
index 59173c8b1..681434eb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,6 +54,7 @@ allprojects {
         resolutionStrategy.force 'androidx.annotation:annotation:' + annotationXLibraryVersion
         // Downgrade Cronet version for cronet-okhttp
         resolutionStrategy.force 'org.chromium.net:cronet-api:' + cronetApiVersion
+        resolutionStrategy.force 'androidx.multidex:multidex:' + multiDexVersion
 
         // Replace with modded library (leanback-1.0.0)
         exclude group: 'androidx.leanback', module: 'leanback'