Merge "Updating allowed keymaster attestation versions"