Clear exception before calling ValidateSuperClassDescriptors
am: 88cfa338da

Change-Id: If792a2608c5bbc182ace837506d54bab49b67a5a