Merge "Revert "Revert "Revert "[avf] Adjust IRPC VTS tests to handle AV..."" into main