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

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