BUG=chromium:631979
NOTRY=true

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