Merge "Improve ValidateSuperClassDescriptors performance."