manual bench rebase after bf0b9ce

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

Bypassing trybots:
NOTRY=true

NOTREECHECKS=true

Author: bensong@google.com

Review URL: https://codereview.chromium.org/385073005
9 files changed