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

Change-Id: I4c2e1bd86a96a2ec73169353d4a9f2da0d0e9c01