Clean checkstyle violations and warnings.

Change-Id: Ife0188817e52765cea40b265aa9ba1378f36d64b