Address Checkstyle violations

Backport of 9416416ff4 to 1.7.x.

Should be fine...just want to see the PR builders.