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

* commit 'b833ea2d5cb2724080e89a6abe7ef57f6f21a6ab':
  ART: Fix assumption in class profile collection