Merge "[Manual] Assorted fixes for CheckStyle"
am: 62d0939605

Change-Id: I579175952844a6a72cff8f28e2eadd9790a176cb