R=ahaas@chromium.org

Bug: chromium:887888
Change-Id: I69edac2289ae6c00aeba82edcd780861568165ac
Reviewed-on: https://chromium-review.googlesource.com/1238178Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56130}