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