am c2e6edc0: am 75939a2b: Merge "Fix double-exception in super-class method validation."

* commit 'c2e6edc05feaaf2376c21c20a35ca4c1aa836930':
  Fix double-exception in super-class method validation.