Merge "More error codes for device unique attestation" into main