diff --git a/.travis.yml b/.travis.yml
index ac22d5cda7..49dbef9662 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,9 +38,9 @@ env:
     # This token was generated using the aio-deploy@angular.io account using `firebase login:ci` and password from valentine
     - secure: "L5CyQmpwWtoR4Qi4xlWQh/cL1M6ZeJL4W4QAr4HdKFMgYt9h+Whqkymyh2NxwmCbPvWa7yUd+OiLQUDCY7L2VIg16hTwoe2CgYDyQA0BEwLzxtRrJXl93TfwMlrUx5JSIzAccD6D4sjtz8kSFMomK2Nls33xOXOukwyhVMjd0Cg="
     # ANGULAR_PAYLOAD_FIREBASE_TOKEN
-    # This is for payload size data
-    # TODO(i): the token was generated using the tinagao@google account, we should switch to a shared/role-base account.
-    - secure: "gx0VkaVIAgPt2YZIaNomVgBx8u/5lvVsLTZSkPu8AM0Wdpzy06yKhAO2x56oI51y3FFSLssVw1JEJ9BEL8osnATk0+e6ERL9OZl6fgbf/6WgBBz4wDzMaQ5+yYWGJfwY5AzZdbYUWfh3wVIhH+Q03WmnJgcnnLUaty+YeUFa2Os="
+    # This is for payload size data to "angular-payload-size" firebase project
+    # This token was generated using the payload@angular.io account using `firebase login:ci` and password from valentine
+    - secure: "SxotP/ymNy6uWAVbfwM9BlwETPEBpkRvU/F7fCtQDDic99WfQHzzUSQqHTk8eKk3GrGAOSL09vT0WfStQYEIGEoS5UHWNgOnelxhw+d5EnaoB8vQ0dKQBTK092hQg4feFprr+B/tCasyMV6mVwpUzZMbIJNn/Rx7H5g1bp+Gkfg="
   matrix:
     # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
     - CI_MODE=e2e
diff --git a/aio/scripts/payload.sh b/aio/scripts/payload.sh
index 0c77406201..9ea6e93eb5 100755
--- a/aio/scripts/payload.sh
+++ b/aio/scripts/payload.sh
@@ -3,6 +3,7 @@
 # WARNING: FIREBASE_TOKEN should NOT be printed.
 set +x -eu -o pipefail
 
+readonly thisDir=$(cd $(dirname $0); pwd)
 readonly TOKEN=${ANGULAR_PAYLOAD_FIREBASE_TOKEN:-}
 readonly PROJECT_NAME="angular-payload-size"
 
@@ -42,8 +43,8 @@ payloadData="$payloadData\"timestamp\": $timestamp, "
 
 # Add change source: application, dependencies, or 'application+dependencies'
 yarnChanged=false
-allChangedFiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE ./ | wc -l)
-allChangedFileNames=$(git diff --name-only $TRAVIS_COMMIT_RANGE ./)
+allChangedFiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE $thisDir | wc -l)
+allChangedFileNames=$(git diff --name-only $TRAVIS_COMMIT_RANGE $thisDir)
 
 if [[ $allChangedFileNames == *"yarn.lock"* ]]; then
   yarnChanged=true