R=titzer@chromium.org

Change-Id: Ia1eca39add782c5af27f12c2bb450cc7837a4251
Reviewed-on: https://chromium-review.googlesource.com/1113678Reviewed-by: Ben Titzer <titzer@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54017}