diff --git a/google/data_source_google_client_config.go b/google/data_source_google_client_config.go
index 90f01aca24a..e202ed17e67 100644
--- a/google/data_source_google_client_config.go
+++ b/google/data_source_google_client_config.go
@@ -20,6 +20,11 @@ func dataSourceGoogleClientConfig() *schema.Resource {
 				Computed: true,
 			},
 
+			"zone": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"access_token": {
 				Type:      schema.TypeString,
 				Computed:  true,
@@ -35,6 +40,7 @@ func dataSourceClientConfigRead(d *schema.ResourceData, meta interface{}) error
 	d.SetId(time.Now().UTC().String())
 	d.Set("project", config.Project)
 	d.Set("region", config.Region)
+	d.Set("zone", config.Zone)
 
 	token, err := config.tokenSource.Token()
 	if err != nil {
diff --git a/google/data_source_google_client_config_test.go b/google/data_source_google_client_config_test.go
index b6b355e5c20..108678ee3a1 100644
--- a/google/data_source_google_client_config_test.go
+++ b/google/data_source_google_client_config_test.go
@@ -20,6 +20,7 @@ func TestAccDataSourceGoogleClientConfig_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "project"),
 					resource.TestCheckResourceAttrSet(resourceName, "region"),
+					resource.TestCheckResourceAttrSet(resourceName, "zone"),
 					resource.TestCheckResourceAttrSet(resourceName, "access_token"),
 				),
 			},
diff --git a/google/resource_compute_backend_bucket_signed_url_key.go b/google/resource_compute_backend_bucket_signed_url_key.go
index d9463514616..e0a154ce102 100644
--- a/google/resource_compute_backend_bucket_signed_url_key.go
+++ b/google/resource_compute_backend_bucket_signed_url_key.go
@@ -272,16 +272,20 @@ func flattenNestedComputeBackendBucketSignedUrlKey(d *schema.ResourceData, meta
 		// If only an id is given in parent resource,
 		// construct a resource map for that id KV pair.
 		item := map[string]interface{}{"keyName": vRaw}
-		itemIdV, err := expandComputeBackendBucketSignedUrlKeyName(d.Get("name"), d, meta.(*Config))
+		var expectedV, itemV interface{}
+		var err error
+
+		expectedV, err = expandComputeBackendBucketSignedUrlKeyName(d.Get("name"), d, meta.(*Config))
 		if err != nil {
 			return nil, err
 		}
-		actualIdV := flattenComputeBackendBucketSignedUrlKeyName(item["keyName"], d)
-		log.Printf("[DEBUG] Checking if item's keyName (%#v) is equal to resource's (%#v)", itemIdV, actualIdV)
-		if !reflect.DeepEqual(itemIdV, actualIdV) {
+		itemV = flattenComputeBackendBucketSignedUrlKeyName(item["keyName"], d)
+		log.Printf("[DEBUG] Checking if item's keyName (%#v) is equal to resource's (%#v)", itemV, expectedV)
+		if !reflect.DeepEqual(itemV, expectedV) {
 			continue
 		}
-		return item, nil
+
+		return item, err
 	}
 	return nil, nil
 }
diff --git a/google/resource_compute_backend_service_signed_url_key.go b/google/resource_compute_backend_service_signed_url_key.go
index ee809fbd529..ce5b74e4ee9 100644
--- a/google/resource_compute_backend_service_signed_url_key.go
+++ b/google/resource_compute_backend_service_signed_url_key.go
@@ -272,16 +272,20 @@ func flattenNestedComputeBackendServiceSignedUrlKey(d *schema.ResourceData, meta
 		// If only an id is given in parent resource,
 		// construct a resource map for that id KV pair.
 		item := map[string]interface{}{"keyName": vRaw}
-		itemIdV, err := expandComputeBackendServiceSignedUrlKeyName(d.Get("name"), d, meta.(*Config))
+		var expectedV, itemV interface{}
+		var err error
+
+		expectedV, err = expandComputeBackendServiceSignedUrlKeyName(d.Get("name"), d, meta.(*Config))
 		if err != nil {
 			return nil, err
 		}
-		actualIdV := flattenComputeBackendServiceSignedUrlKeyName(item["keyName"], d)
-		log.Printf("[DEBUG] Checking if item's keyName (%#v) is equal to resource's (%#v)", itemIdV, actualIdV)
-		if !reflect.DeepEqual(itemIdV, actualIdV) {
+		itemV = flattenComputeBackendServiceSignedUrlKeyName(item["keyName"], d)
+		log.Printf("[DEBUG] Checking if item's keyName (%#v) is equal to resource's (%#v)", itemV, expectedV)
+		if !reflect.DeepEqual(itemV, expectedV) {
 			continue
 		}
-		return item, nil
+
+		return item, err
 	}
 	return nil, nil
 }
diff --git a/google/resource_resource_manager_lien.go b/google/resource_resource_manager_lien.go
index cb22d7fd745..05de60544b9 100644
--- a/google/resource_resource_manager_lien.go
+++ b/google/resource_resource_manager_lien.go
@@ -304,13 +304,17 @@ func flattenNestedResourceManagerLien(d *schema.ResourceData, meta interface{},
 	items := v.([]interface{})
 	for _, vRaw := range items {
 		item := vRaw.(map[string]interface{})
-		itemIdV := d.Get("name")
-		actualIdV := flattenResourceManagerLienName(item["name"], d)
-		log.Printf("[DEBUG] Checking if item's name (%#v) is equal to resource's (%#v)", itemIdV, actualIdV)
-		if !reflect.DeepEqual(itemIdV, actualIdV) {
+		var expectedV, itemV interface{}
+		var err error
+
+		expectedV = d.Get("name")
+		itemV = flattenResourceManagerLienName(item["name"], d)
+		log.Printf("[DEBUG] Checking if item's name (%#v) is equal to resource's (%#v)", itemV, expectedV)
+		if !reflect.DeepEqual(itemV, expectedV) {
 			continue
 		}
-		return item, nil
+
+		return item, err
 	}
 	return nil, nil
 }
diff --git a/website/docs/d/datasource_client_config.html.markdown b/website/docs/d/datasource_client_config.html.markdown
index 52f02029a49..4b888c8ce03 100644
--- a/website/docs/d/datasource_client_config.html.markdown
+++ b/website/docs/d/datasource_client_config.html.markdown
@@ -51,4 +51,6 @@ In addition to the arguments listed above, the following attributes are exported
 
 * `region` - The region to operate under.
 
+* `zone` - The zone to operate under.
+
 * `access_token` - The OAuth2 access token used by the client to authenticate against the Google Cloud API.