Update Checkstyle rules to better match the style guide.
am: 9cd6eaacba

* commit '9cd6eaacba601ce443d9d1fc3573f876a778af35':
  Update Checkstyle rules to better match the style guide.