Merge "Add new rules to Checkstyle config." into nyc-dev