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