Merge "Fix duplicate classes check to iterate over classes properly."
am: 4f5dbc25f8

Change-Id: I6ec5b1943122c16d130f548eb514c98cdf5fe883