am d0ac3249: Merge "Improve ValidateSuperClassDescriptors performance."

* commit 'd0ac32499f162030f85cd45104f8e38ef01541df':
  Improve ValidateSuperClassDescriptors performance.