Merge "Fix imprecise name of a fs-verity helper function"