am 82f91da7: am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"

* commit '82f91da700445c4606faea45ac8f0dc9f2857471':
  Change conditionallyCheckInstanceCounts to use countInstancesOfClasses