One more attempt at rebaselining

TBR=egdaniel@google.com
NOTREECHECKS=true

Review URL: https://codereview.chromium.org/708903006
16 files changed