Merge "Add FrameworksVpnTests" into main