Apply fixup to test/data submodule and bring it back to the v2.18.x branch.