R=titzer@chromium.org

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