Merge "Add dumping for number of classes initialized"
am: e0d6e073e9

Change-Id: I570bd732d81e403796bcecd1e10499ede2ab7053