Merge "Fix fsverity format"