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

Change-Id: Icb4c9b544acde2b0d37d3932a0484396d275ca35