diff --git a/android/build.gradle b/android/build.gradle
index 9cd0a34782..025ae5e5c2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -16,7 +16,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 008f4bbb1d..07faab870e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.0'
     classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.13'
     classpath 'net.ltgt.gradle:gradle-apt-plugin:0.13'
-    classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
+    classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.5"
     classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.2.5'
   }
 }
diff --git a/compiler/build.gradle b/compiler/build.gradle
index ab3d6f6e1a..df95ec7c54 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -48,6 +48,13 @@ model {
     // set 'vcDisable=true'
     if (!vcDisable) {
       visualCpp(VisualCpp) {
+        // Prefer vcvars-provided environment over registry-discovered environment
+        def String vsDir = System.getenv("VSINSTALLDIR")
+        def String winDir = System.getenv("WindowsSdkDir")
+        if (vsDir != null && winDir != null) {
+          installDir = vsDir
+          windowsSdkDir = winDir
+        }
       }
     }
     gcc(Gcc) {
diff --git a/examples/android/clientcache/gradle/wrapper/gradle-wrapper.properties b/examples/android/clientcache/gradle/wrapper/gradle-wrapper.properties
index 92165eede8..c30d4c017b 100644
--- a/examples/android/clientcache/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/android/clientcache/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
index 92165eede8..c30d4c017b 100644
--- a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties b/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties
index 92165eede8..c30d4c017b 100644
--- a/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/examples/example-kotlin/android/helloworld/gradle/wrapper/gradle-wrapper.properties b/examples/example-kotlin/android/helloworld/gradle/wrapper/gradle-wrapper.properties
index 92165eede8..c30d4c017b 100644
--- a/examples/example-kotlin/android/helloworld/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/example-kotlin/android/helloworld/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/examples/example-kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/example-kotlin/gradle/wrapper/gradle-wrapper.properties
index 92165eede8..c30d4c017b 100644
--- a/examples/example-kotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/example-kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 92165eede8..c30d4c017b 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/gae-interop-testing/gae-jdk7/build.gradle b/gae-interop-testing/gae-jdk7/build.gradle
index a459432006..15e43b4215 100644
--- a/gae-interop-testing/gae-jdk7/build.gradle
+++ b/gae-interop-testing/gae-jdk7/build.gradle
@@ -22,7 +22,7 @@ buildscript {    // Configuration for building
     }
   }
   dependencies {
-    classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3'
+    classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.5'
     classpath 'com.squareup.okhttp:okhttp:2.5.0'
   }
 }
diff --git a/gae-interop-testing/gae-jdk8/build.gradle b/gae-interop-testing/gae-jdk8/build.gradle
index de6721b685..f2adf0aeb2 100644
--- a/gae-interop-testing/gae-jdk8/build.gradle
+++ b/gae-interop-testing/gae-jdk8/build.gradle
@@ -22,7 +22,7 @@ buildscript {    // Configuration for building
     }
   }
   dependencies {
-    classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3'
+    classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.5'
     classpath 'com.squareup.okhttp:okhttp:2.5.0'
   }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 92165eede8..c30d4c017b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip