manual bench rebase after 55ada06

R=robertphillips@google.com
TBR=robertphillips@google.com

Bypassing trybots:
NOTRY=true

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/315683004
5 files changed