This is to pick up
https://chromium.googlesource.com/infra/luci/luci-go/+/6a48964ed488db0992aea5ddc395142a6d02dadf

R=vadimsh

Bug: 1288635, 1306248
Change-Id: I38787b5144641b8d291a29d1361a2cc972f08082
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3543152
Auto-Submit: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>