In the process, also fix a merge hiccup that clobbered https://codereview.chromium.org/2003663002/ back in May.

BUG=chromium:608675
LOG=N

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