Merge "Add missing fs-verity setup for UPS." into main