BUG=chromium:631979
NOTRY=true

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