am 67875c4a: Merge "Relax KeyPairGeneratorTest"

* commit '67875c4ab6941278e57e6c1d05156703b55be6ef':
  Relax KeyPairGeneratorTest