am 8742e120: Merge change 4311 into donut

Merge commit '8742e120608328e2505f15903a33e538e68bd519'

* commit '8742e120608328e2505f15903a33e538e68bd519':
  Add keygen API to Keystore.