Checkstyle: Category Blocks

Change-Id: I628dbb33f4e2cf974a1fb41211daaa5b8381e82a