Merge change 4337 into donut

* changes:
  Change the keystore APIs.