Merge "Fix fs-verity per fs-verity spec change" into pi-dev