[master 20/24] Fix missed rebase of populator test from 169dc6b6.