Merge "Add VPN UT and CTS into presubmit" into main