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

Bug: chromium:868202
Change-Id: I5c0860894c96a8ce14e74cb048f786908db88269
Reviewed-on: https://chromium-review.googlesource.com/c/1344150
Commit-Queue: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#57680}