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

Change-Id: Id9d19239b6e5cd7c0a3c5344cefbdd2c2338df1f