Merge branch 'master' of github.com:googleapis/google-cloud-go into master