Merge change 3709 into donut

* changes:
  Provide the Keystore feature in the framework.