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