[PATCH 8/9] gcp-setup: Fixes bug12763