Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev