BUG=chromium:644096
TBR=thakis@chromium.org
NOTRY=true

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