DESCRIPTION

Checkstyle misc. fixes.

This fixes a number of checkstyle issues which have been
around for a while.  Some are still in code review, but a merge
commit is a bit in the way of putting things in the right order.

Change-Id: Icd79b614ef53840130abd8ec8adf1ebdb8fccdb4


COMMENTS

