Missing changes from https://chromium-review.googlesource.com/q/owner:tandrii%2540google.com+%2522remove+tandrii%2540%2522
(and nodir@)

Change-Id: I9ae573f2b01bcc5e65e17202b90bc724210cd971
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3252670Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Scott Lee <ddoman@chromium.org>