R=bmeurer@chromium.org

Change-Id: Iece8e73581e99456f9647b9ae6af6045305811f4
Reviewed-on: https://chromium-review.googlesource.com/1139058Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54483}