R=ahaas@chromium.org

Bug: 
Change-Id: I3817745013828d455ca1b623724d8789cc5f01ce
Reviewed-on: https://chromium-review.googlesource.com/860643Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Ben Titzer <titzer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50510}