Merge "Removed unused variables in cat service" am: 9718148ef7
am: 40b897fd7a

Change-Id: Id32d50057c15903c57f8ec3f5fe2c151d7150439