Merge "Use consistent name for KeyPairGeneratorSpi." into mnc-dev