diff --git a/gradle/overrides.gradle b/gradle/overrides.gradle
index a57970ee49..178afc3f11 100644
--- a/gradle/overrides.gradle
+++ b/gradle/overrides.gradle
@@ -1,5 +1,11 @@
 configurations.all {
     resolutionStrategy {
+        capabilitiesResolution {
+            withCapability("com.google.collections:google-collections") {
+                selectHighestVersion()
+            }
+        }
+
         if (!Boolean.getBoolean("skipVersionConflict")) {
             failOnVersionConflict()
         }