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