Broke in https://codereview.chromium.org/2116913002/ due
to rebase.

BUG=chromium:474921
NOTRY=true
TBR=jochen@chromium.org, dpranke@chromium.org

Review-Url: https://codereview.chromium.org/2156993002
Cr-Commit-Position: refs/heads/master@{#37841}