Merge "Fix out of date javadoc for ApfV6Generator" into main