Downstream counterpart to https://chromium-review.googlesource.com/1481660

R=martiniss@chromium.org, nodir@chromium.org

Bug: 930761, 927716
Change-Id: Ib6390b3d27bed79a01eefa966084233e71aa8235
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1496049
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>