BUG=517446 Review URL: https://codereview.chromium.org/1565933002 Cr-Commit-Position: refs/heads/master@{#368043}