Merge "Refactor: break fs-verity data gen into 2 parts"