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