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