TBR=machenbach@chromium.org
NOTRY=true

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

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