Merge "Delete ClassDataItemIterator"
am: 92a97be045

Change-Id: I7a88ee52acd070ae1ed3135c8ede81c8aed4d5b0