BUG=chromium:648583
NOTRY=true

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