To pick https://chromium-review.googlesource.com/c/infra/infra/+/2521159

Change-Id: Icff019c71c87a3e1e288c4cc1c5ebace7a372b02
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2564645
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Nodir Turakulov <nodir@chromium.org>