Merge "Add ClassIterator" am: d804b76c0b
am: 5369e99f5e

Change-Id: I30800577befd5ca82ad0cde0d15ad0ce112632b6