Merge "Add device id attestation tags"