Merge "Make checkstyle_hook happy" into main