BUG= Review URL: https://codereview.chromium.org/952093002 Cr-Commit-Position: refs/heads/master@{#317966}