Clean up profile AddClass APIs
am: 45cdd05e32

Change-Id: Idbd4101187cae0a159af9f0fe70072c692f35081