Merge "Allow non-VPNs to have underlying networks." into sc-dev