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