Merge "Update VpnTests for adding ESP arguments"