This should have been part of https://codereview.chromium.org/1056863002/. :-/

TBR=jkummerow@chromium.org

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

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