BUG=chromium:651211
R=dgozman@chromium.org

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