Merge "Make VTS test only apply to RKP VM (i.e. avf)" into main