Merge change 4728 into donut

* changes:
  Add device, property, directory, and file permissions for VPN.