Merge "Add device id attestation"