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