R=machenbach@chromium.org, tmrts@chromium.org

No-Try: true
Bug: chromium:616879
Change-Id: I1dbef7ca4ac69df2d3de654b381ab163d5be4214
Reviewed-on: https://chromium-review.googlesource.com/c/1409200
Commit-Queue: Sergiy Belozorov <sergiyb@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58845}