To pick up
optimization https://chromium-review.googlesource.com/c/infra/infra/+/2570537
and a fix https://chromium-review.googlesource.com/c/infra/infra/+/2577951

R=dpranke@google.com, ehmaldonado@google.com

Bug: 1154541
Change-Id: I43b9bc64ba24a642889b94f6f8344a66a18b7339
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2580123
Commit-Queue: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Auto-Submit: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>