Fix changes that got lost in merges (#1293)
Fix changes that got lost in merges (#1293)

Merged PR #1293.

GoogleCloudPlatform/magic-modules,GoogleCloudPlatform/magic-modules,GoogleCloudPlatform/magic-modules,GoogleCloudPlatform/magic-modules,GoogleCloudPlatform/magic-modules