Merge change 8082 into donut

* changes:
  Cleanup the old keystore APIs.