Merge "Use appropriate interpreter based on APF version in ApfTest" into main