Merge "Add ClassIterator"
am: d804b76c0b

Change-Id: I3959a35882881ae952173acab59543340468e7d2