To pickup:
  * https://crrev.com/c/3290046
  * https://crrev.com/c/3290193

R=vadimsh

Change-Id: I72ac9a25100a89d201929c1727cf23df1a7206df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3290283
Auto-Submit: Yiwei Zhang <yiwzhang@google.com>
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>