Changes for Google Cloud

Changes for Google Cloud