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

Change-Id: If22be3478798d5a3f867995bf646f5235f90e72f