Merge "Revert "Revert "[avf] Adjust IRPC VTS tests to handle AVF in uns..."" into main