Address code review comments.

1 job for add-more-checkstyle-modules in 6 minutes and 44 seconds (queued for 3 seconds)