R=jarin@chromium.org

BUG=chromium:669242

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