Merge "Change fs-verity setup to the new format"