[automerger skipped] Clear exception before calling ValidateSuperClassDescriptors
am: 617df6694d -s ours
am skip reason: change_id Ia56af1ff497d30539a42a772979320df699b658a with SHA1 88cfa338da is in history

Change-Id: I8a9efe78e3b51daa84da96b876c2e3c7a923e15f