Merge "Only fetch an attestation key if challenge present"