Contains a fix for crbug.com/1021520.

R=nodir@chromium.org, tandrii@chromium.org
BUG=1021520

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