Add HotCat

Change-Id: I20c835182bf07c09fc4f1189482eb5bd819e83a6