Merge "Allow Device IDs in Key attestation request"