TBR=sigurds@chromium.org

Change-Id: Ibc6bcb9f9576a34d909a8f0d0fbdc2899f0b671e
Reviewed-on: https://chromium-review.googlesource.com/1127369Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54276}