Primarily to pick up https://chromium-review.googlesource.com/c/infra/luci/luci-go/+/1600250

R=vadimsh@chromium.org

Change-Id: I01cc74af93b4044f2607d98e7889de7965eaf60b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1650505
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Vadim Shtayura <vadimsh@chromium.org>
Auto-Submit: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>