Merge "Add support for app-generated attestation keys."