Addressing comment in https://codereview.chromium.org/2102073002/

BUG=chromium:576312, chromium:623516

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