Merge "Mock more resources for VPNs."