BUG=chromium:590036
NOTRY=true

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