R=clemensh@chromium.org

Change-Id: I97cadf40e441c5d19a1ea9b03a5d2f04505f04c5
Reviewed-on: https://chromium-review.googlesource.com/964365Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Commit-Queue: Ben Titzer <titzer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51968}