Merge "Add files for AvcTest" into main