Clear exception before calling ValidateSuperClassDescriptors am: 88cfa338da
am: bced8a7875

Change-Id: Ib95496753e9f59259ee7cac1388509ebf602a46b