Merge "Clean up some logic skipping ValidateSuperClassDescriptors."