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