diff --git a/build/terraform b/build/terraform
index 6c8ef61974fa..d7eeb0a685bb 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 6c8ef61974fa2011f8105e233915697929904c46
+Subproject commit d7eeb0a685bb5d1b0ceb42def421fde8140a9ba4
diff --git a/build/terraform-beta b/build/terraform-beta
index 7743e40d0852..f17b2f9709cd 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit 7743e40d08525ab2c5fef602150bdb1f847b9729
+Subproject commit f17b2f9709cd5656ac9a45b16499118f59bbf245
diff --git a/build/terraform-mapper b/build/terraform-mapper
index 43d9f58687b3..806c3d7588bc 160000
--- a/build/terraform-mapper
+++ b/build/terraform-mapper
@@ -1 +1 @@
-Subproject commit 43d9f58687b33d0f8dbb5949075d8436e66261c0
+Subproject commit 806c3d7588bcd9f5a10ee60bf0bc025ed8734b14
diff --git a/third_party/terraform/utils/common_operation.go b/third_party/terraform/utils/common_operation.go
index f08f5f90b049..994e36d81120 100644
--- a/third_party/terraform/utils/common_operation.go
+++ b/third_party/terraform/utils/common_operation.go
@@ -117,7 +117,7 @@ func CommonRefreshFunc(w Waiter) resource.StateRefreshFunc {
 			for _, e := range getAllTypes(err, &googleapi.Error{}, &url.Error{}) {
 				if isRetryableError(e, predicates) {
 					log.Printf("[DEBUG] Dismissed error on GET of operation '%v' retryable: %s", w.OpName(), err)
-					return op, "done: false", nil
+					return nil, "done: false", nil
 				}
 			}
 
@@ -131,7 +131,7 @@ func CommonRefreshFunc(w Waiter) resource.StateRefreshFunc {
 		if err = w.Error(); err != nil {
 			if w.IsRetryable(err) {
 				log.Printf("[DEBUG] Retrying operation GET based on retryable err: %s", err)
-				return op, w.State(), nil
+				return nil, w.State(), nil
 			}
 			return nil, "", err
 		}