Merge "Device ID Attestation: Fix API review"