Merge "ART: Fix assumption in class profile collection" into nyc-dev