To deploy the changes of the following CLs
- https://crrev.com/c/2617742
- https://crrev.com/c/2594641

Bug: 1155298
Bug: 1141153
Change-Id: Ia09f1817285d9c3db38b7d7684b714e02f38b5b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2625979Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Scott Lee <ddoman@chromium.org>