BUG=

Review-Url: https://codereview.chromium.org/2126423002
Cr-Commit-Position: refs/heads/master@{#37600}