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