Address the code review comments.

1 job for check-code-quality-with-checkstyle in 6 minutes and 42 seconds (queued for 5 seconds)