Merge change 4460 into donut

* changes:
  Use the new keystore API in vpn service.