To pick up: https://crrev.com/c/3084064

R=tandrii, vadimsh

Change-Id: I74810ca84b3d3304f4624242abd158b948cd1719
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3088082
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>
Commit-Queue: Vadim Shtayura <vadimsh@chromium.org>
Auto-Submit: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>