Merge "Add tests for VPN validation in NetworkMonitor"