Merge "Refactor: disambiguate fs-verity helper functions"