Merge "Fix unique id attestation on devices with keymaster"