Checkstyle: Category Imports

Change-Id: Ib4872697d92d7e4ca533f496fc1d0d8690c491f6