Merge "Add TEST_MAPPING for VPN related files" into main