Merge "Take into account the change in classes when analysing profiles" into nyc-dev
am: c736384

* commit 'c736384b7e6f92d479c90811939f7619a97bf3fc':
  Take into account the change in classes when analysing profiles

Change-Id: I2c06df94b5973756cf9c743ae7a81fa6a3226f9a