TBR=machenbach@chromium.org

Bug: chromium:860430
Change-Id: I5554468a7c11038903fc3ab5eca067c230b2849a
Reviewed-on: https://chromium-review.googlesource.com/1127370
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54279}