Merge "Allow extra error code in device ID attestation"