Merge "Changes for Checkstyle 8.32"