R=titzer@chromium.org

Change-Id: I9d2bc2fdaec03b109cb6620371e70fc74a1a5ed4
Reviewed-on: https://chromium-review.googlesource.com/966283
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Reviewed-by: Ben Titzer <titzer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52000}