Merge "VPN: refactor a little bit for the upcoming integration of legacy VPN."