am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"

* commit 'ebac4d1b0858ee02e095e35969c8f7421a0f5cea':
  Change conditionallyCheckInstanceCounts to use countInstancesOfClasses