Merge "Fix duplicate classes check to iterate over classes properly."