Merge "Fix KeyPairGeneratorTest."