Backport checkstyle fixes