BUG=chromium:474921
NOTRY=true

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