am 1f75d709: Add VPN and Keystore services and data directories.

Merge commit '1f75d709c10f49d2e2390b888e766bcfd17da860'

* commit '1f75d709c10f49d2e2390b888e766bcfd17da860':
  Add VPN and Keystore services and data directories.