R=delphick@chromium.org

Change-Id: Iad00b090d1576a4a556e0971bbea3003a3aedb3f
Reviewed-on: https://chromium-review.googlesource.com/982631Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52265}