R=titzer@chromium.org

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