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

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