am 5570651e: Merge change 4730 into donut

Merge commit '5570651ee3c96a2f9e484583291cad2b533c865a'

* commit '5570651ee3c96a2f9e484583291cad2b533c865a':
  fstest: Fix device, directory, and file permissions for VPN.