Merge change 6198 into donut

* changes:
  keystore: Provide a generic getter for native components.