R=clemensh@chromium.org,mstarzinger@chromium.org

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