R=nodir@chromium.org,  vadimsh@chromium.org, yiwzhang@google.com

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