am 653349fe: Merge change 4329 into donut

Merge commit '653349fe48f2995d9e17b5e0a4110925cffdaeab'

* commit '653349fe48f2995d9e17b5e0a4110925cffdaeab':
  Change the first parameter of Keystore.generateKeyPair() to int.