R=machenbach@chromium.org,brettw@chromium.org
LOG=n
BUG=none

Review URL: https://codereview.chromium.org/846743004

Cr-Commit-Position: refs/heads/master@{#26151}