BUG= Review-Url: https://codereview.chromium.org/1923573006 Cr-Commit-Position: refs/heads/master@{#391855}