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

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