Merge "Revert "Remove fsverity_init"" into main