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

Change-Id: I0fe0dffe59d8d9c9a0fdd05e07b07aa6c8da0a80
2 files changed