am 921ce9d0: am 67875c4a: Merge "Relax KeyPairGeneratorTest"

* commit '921ce9d004bae3d8e58d2357bda00f4957af370b':
  Relax KeyPairGeneratorTest