manual bench rebase after f459c85, adjusted with ed458688e284508f17a0408a093d89a8b5966e32

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

Bypassing trybots:
NOTRY=true

Author: bensong@google.com

Review URL: https://codereview.chromium.org/394673002
1 file changed