R=hpayer@chromium.org
BUG=chromium:651828

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