Initial changes to support gcloud library.