BUG=597761 Review URL: https://codereview.chromium.org/1889423002 Cr-Commit-Position: refs/heads/master@{#388224}