Merge change 7508 into donut

* changes:
  keystore: Fix a compile warning.