To include changes:
- https://chromium-review.googlesource.com/c/infra/luci/luci-go/+/2536026
- https://chromium-review.googlesource.com/c/infra/luci/luci-go/+/2535098

Bug: 1147548
Change-Id: I504a936760e8aafb926b9c1f622610e03207882c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2538208Reviewed-by: Scott Lee <ddoman@chromium.org>
Commit-Queue: Chan Li <chanli@chromium.org>