Merge "Add legacy VPN test framework and test cases" into klp-dev