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