Merge change 4311 into donut

* changes:
  Add keygen API to Keystore.