R=jgruber@chromium.org, verwaest@chromium.org

Change-Id: I5b607e9c121accafff0c65fc74b073a873f749af
Reviewed-on: https://chromium-review.googlesource.com/721665Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48807}