diff --git a/build/terraform b/build/terraform
index be55e43fbcbe..ac70b40e20cb 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit be55e43fbcbe5becee901304277981e9f5bdcfc0
+Subproject commit ac70b40e20cb24baf6b5a8e9220a1ff03702265b
diff --git a/build/terraform-beta b/build/terraform-beta
index c2c858b8a48a..01b331fc08e1 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit c2c858b8a48a692587e02fee22a3325beba917d9
+Subproject commit 01b331fc08e1be0c843398dd67335edf8eca56eb
diff --git a/products/accesscontextmanager/terraform.yaml b/products/accesscontextmanager/terraform.yaml
index 45a8a0aa7b38..0e0d6e646838 100644
--- a/products/accesscontextmanager/terraform.yaml
+++ b/products/accesscontextmanager/terraform.yaml
@@ -54,7 +54,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         custom_flatten: templates/terraform/custom_flatten/default_if_empty.erb
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       encoder: templates/terraform/encoders/access_level_never_send_parent.go.erb
-      custom_import: templates/terraform/custom_import/access_level_self_link_as_name_and_set_parent.go.erb
+      custom_import: templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb
   ServicePerimeter: !ruby/object:Overrides::Terraform::ResourceOverride
     timeouts: !ruby/object:Api::Timeouts
       insert_minutes: 6
@@ -79,7 +79,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         input: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       encoder: templates/terraform/encoders/access_level_never_send_parent.go.erb
-      custom_import: templates/terraform/custom_import/access_level_self_link_as_name_and_set_parent.go.erb
+      custom_import: templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb
 # This is for copying files over
 files: !ruby/object:Provider::Config::Files
   # These files have templating (ERB) code that will be run.
diff --git a/templates/terraform/custom_import/access_level_self_link_as_name_and_set_parent.go.erb b/templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb
similarity index 84%
rename from templates/terraform/custom_import/access_level_self_link_as_name_and_set_parent.go.erb
rename to templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb
index cb7af186cd5a..1eb1a5faab37 100644
--- a/templates/terraform/custom_import/access_level_self_link_as_name_and_set_parent.go.erb
+++ b/templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb
@@ -19,5 +19,8 @@
 		return nil, err
 	}
 	stringParts := strings.Split(d.Get("name").(string), "/")
+	if len(stringParts) < 2 {
+		return nil, fmt.Errorf("Error parsing parent name. Should be in form accessPolicies/{{policy_id}}/<%= object.name.pluralize.camelize(:lower) -%>/{{short_name}}")
+	}
 	d.Set("parent", fmt.Sprintf("%s/%s", stringParts[0], stringParts[1]))
 	return []*schema.ResourceData{d}, nil