diff --git a/build/terraform b/build/terraform
index 906fc276e5dc..125db9d61cb1 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 906fc276e5dc5ec1d73fe6e526f8e8afcccb1f75
+Subproject commit 125db9d61cb15999ba19645e48c6903f066581fb
diff --git a/build/terraform-beta b/build/terraform-beta
index 3a9e91f0b154..cb36bdcf059a 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit 3a9e91f0b154edf56e3694e296f538572a062d0e
+Subproject commit cb36bdcf059a976c3247c8b6cac6723428530811
diff --git a/compiler.rb b/compiler.rb
index 6eede217b659..582d67a14ac8 100755
--- a/compiler.rb
+++ b/compiler.rb
@@ -124,12 +124,15 @@
     raise "Product '#{product_name}' does not have an api.yaml file"
   end
 
-  product_yaml = File.read(product_yaml_path)
-
   if File.exist?(product_override_path)
-    orig = YAML.load_file(product_yaml_path)
-    result = orig.merge(YAML.load_file(product_override_path))
+    result = if File.exist?(product_yaml_path)
+               YAML.load_file(product_yaml_path).merge(YAML.load_file(product_override_path))
+             else
+               YAML.load_file(product_override_path)
+             end
     product_yaml = result.to_yaml
+  else
+    product_yaml = File.read(product_yaml_path)
   end
 
   unless File.exist?(provider_yaml_path) || File.exist?(provider_override_path)