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