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

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

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