diff --git a/Spanner/src/Connection/Grpc.php b/Spanner/src/Connection/Grpc.php
index c08c4694808..eadd2323602 100644
--- a/Spanner/src/Connection/Grpc.php
+++ b/Spanner/src/Connection/Grpc.php
@@ -124,7 +124,8 @@ class Grpc implements ConnectionInterface
 
     private function enableConnectionManagement($conf_path)
     {
-        // TODO: move this function to GrpcTrait.
+        // TODO(ddyihai): move this function to GrpcTrait, if we are going
+        // to enable the grpc-gcp library for other apis.
         $conf = new \Grpc\Gcp\ApiConfig();
         $conf->mergeFromJsonString($string = file_get_contents($conf_path));
         $config = new Config($conf);
diff --git a/Spanner/src/spanner.grpc.config b/Spanner/src/Connection/spanner.grpc.config
similarity index 100%
rename from Spanner/src/spanner.grpc.config
rename to Spanner/src/Connection/spanner.grpc.config
diff --git a/composer.json b/composer.json
index 5b19f5d0b41..21475de8f5b 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
         "psr/http-message": "1.0.*",
         "ramsey/uuid": "~3",
         "google/gax": "^0.35",
-        "zhouyihaiding/grpc-gcp-test": "dev-master"
+        "google/grpc-gcp": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0",