implement cf fix for https://issuetracker.google.com/issues/155215191
implement cf fix for https://issuetracker.google.com/issues/155215191

GoogleCloudPlatform/cloud-foundation-fabric,GoogleCloudPlatform/cloud-foundation-fabric,GoogleCloudPlatform/cloud-foundation-fabric,GoogleCloudPlatform/cloud-foundation-fabric