diff --git a/build/ansible b/build/ansible
index 6c806829f269..6fd209ff708c 160000
--- a/build/ansible
+++ b/build/ansible
@@ -1 +1 @@
-Subproject commit 6c806829f26924b160c38a717df880e827c55783
+Subproject commit 6fd209ff708cfff9a269de754990fc5c5e859be6
diff --git a/build/terraform b/build/terraform
index 4e07a6435f7b..509b21988c06 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 4e07a6435f7b7f04ab2f80e0dec2fd5848ae8812
+Subproject commit 509b21988c06f3fc952c18ec3e67c12e2fb8ec84
diff --git a/build/terraform-beta b/build/terraform-beta
index f3bd15cc9fab..7d8129577da9 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit f3bd15cc9fabe5bc3ef1a2e098b65320f48e5eb8
+Subproject commit 7d8129577da97ae667a8779490a588b710537835
diff --git a/products/compute/api.yaml b/products/compute/api.yaml
index d9faa0af328b..49462379ee50 100644
--- a/products/compute/api.yaml
+++ b/products/compute/api.yaml
@@ -2974,9 +2974,10 @@ objects:
         description: |
           Network IP address of an instance that should handle matching packets.
         input: true
-      # TODO(nelsonjr): Make this a ResourceRef when VpnTunnel is submitted.
-      - !ruby/object:Api::Type::String
+      - !ruby/object:Api::Type::ResourceRef
         name: 'nextHopVpnTunnel'
+        resource: 'VpnTunnel'
+        imports: 'selfLink'
         description: |
           URL to a VpnTunnel that should handle matching packets.
         input: true
@@ -4086,21 +4087,25 @@ objects:
       - !ruby/object:Api::Type::Array
         name: 'tunnels'
         description: |
-          A list of references to VpnTunnel resources associated to this VPN gateway.
-        # TODO(nelsonjr): Make this a ResourceRef when VpnTunnel is submitted.
-        item_type: Api::Type::String
+          A list of references to VpnTunnel resources associated with this VPN gateway.
+        item_type: !ruby/object:Api::Type::ResourceRef
+          name: 'tunnel'
+          resource: 'VpnTunnel'
+          imports: 'selfLink'
+          description: |
+            A VpnTunnel resource associated with this VPN gateway.
         output: true
       - !ruby/object:Api::Type::Array
         name: 'forwardingRules'
         description: |
-          A list of references to the ForwardingRule resources associated to this VPN
+          A list of references to the ForwardingRule resources associated with this VPN
           gateway.
         item_type: !ruby/object:Api::Type::ResourceRef
           name: 'forwardingRule'
           resource: 'ForwardingRule'
           imports: 'selfLink'
           description: |
-            A ForwardingRule resource associated to this VPN gateway.
+            A ForwardingRule resource associated with this VPN gateway.
         output: true
         # status is not useful for state convergence
   - !ruby/object:Api::Resource
diff --git a/third_party/terraform/tests/resource_compute_vpn_tunnel_test.go b/third_party/terraform/tests/resource_compute_vpn_tunnel_test.go
index b707191797d7..26993c7a6820 100644
--- a/third_party/terraform/tests/resource_compute_vpn_tunnel_test.go
+++ b/third_party/terraform/tests/resource_compute_vpn_tunnel_test.go
@@ -105,6 +105,7 @@ func testAccComputeVpnTunnel_basic() string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
 	name = "tunnel-test-%s"
+	auto_create_subnetworks = false
 }
 resource "google_compute_subnetwork" "foobar" {
 	name = "tunnel-test-subnetwork-%s"
@@ -161,6 +162,7 @@ func testAccComputeVpnTunnel_regionFromGateway(region string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
 	name = "tunnel-test-%s"
+	auto_create_subnetworks = false
 }
 resource "google_compute_subnetwork" "foobar" {
 	name = "tunnel-test-subnetwork-%s"
@@ -219,6 +221,7 @@ func testAccComputeVpnTunnelRouter(router string) string {
 	return fmt.Sprintf(`
 		resource "google_compute_network" "foobar" {
 			name = "tunnel-test-%s"
+			auto_create_subnetworks = false
 		}
 		resource "google_compute_subnetwork" "foobar" {
 			name = "tunnel-test-subnetwork-%s"