BUG=none
R=machenbach@chromium.org
LOG=n
NOTREECHECKS=true

Review URL: https://codereview.chromium.org/771323006

Cr-Commit-Position: refs/heads/master@{#25723}