BUG=chromium:610603
LOG=N
R=hpayer@chromium.org

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