BUG=chromium:609107
R=machenbach@chromium.org
LOG=n

Review-Url: https://codereview.chromium.org/1962253002
Cr-Commit-Position: refs/heads/master@{#36138}