Fix after https://codereview.chromium.org/2028623002/

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

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