Merge "Add VpnTest back to presubmut" into main