Merge "More fixes to the VDM presubmit test mapping." into main