Merge branch 'master' into node-11-fix

Author: kjin

.kokoro/common.cfg

@@ -13,17 +13,6 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 # Use the trampoline script to run in docker.
 build_file: "cloud-debug-nodejs/.kokoro/trampoline.sh"
 
-# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "dpebot_codecov_token"
-      backend_type: FASTCONFIGPUSH
-    }
-  }
-}
-
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"

.kokoro/presubmit/node8/test.cfg

@@ -0,0 +1,9 @@
+# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "dpebot_codecov_token"
+    }
+  }
+}