diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a0e1c65e85c..5f7d12479d4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,6 +2,8 @@
 
 ### dev-v2 (not yet released) ###
 
+* Gradle: Upgrade Gradle version from 4.1 to 4.4 so it can work with Android
+  Studio 3.1 ([#3708](https://github.com/google/ExoPlayer/issues/3708)).
 * Optimize seeking in FMP4 by enabling seeking to the nearest sync sample within
   a fragment. This benefits standalone FMP4 playbacks, DASH and SmoothStreaming.
 * Optimize seeking in FMP4.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 32ec7e33275..5559e8ccfa9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/javadoc_library.gradle b/javadoc_library.gradle
index ea193e661c3..f90131cc98c 100644
--- a/javadoc_library.gradle
+++ b/javadoc_library.gradle
@@ -20,8 +20,6 @@ android.libraryVariants.all { variant ->
         description = "Generates Javadoc for the ${javadocTitle}."
         title = "ExoPlayer ${javadocTitle}"
         source = variant.javaCompile.source
-        classpath = files(variant.javaCompile.classpath.files,
-	                  project.android.getBootClasspath())
         options {
             links "http://docs.oracle.com/javase/7/docs/api/"
             linksOffline "https://developer.android.com/reference",
@@ -30,6 +28,12 @@ android.libraryVariants.all { variant ->
         }
         exclude "**/BuildConfig.java"
         exclude "**/R.java"
+        doFirst {
+            classpath =
+                files(
+                    variant.javaCompile.classpath.files,
+                    project.android.getBootClasspath())
+        }
         doLast {
             copy {
                 from "src/main/javadoc"