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