R=jgruber@chromium.org

Change-Id: Ie2024c5425b657ba1779f1cd2108c7cf406ffade
Reviewed-on: https://chromium-review.googlesource.com/1174431
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55575}