Clean up profile AddClass APIs am: 45cdd05e32 am: ea6cbf7bbb
am: 77fe8cb5c8

Change-Id: Ie404a4a034591c2b0f7f12822b46629f6af41b00