Merge "Correct exception behavior for default methods"
am: d15cd44c90

* commit 'd15cd44c905e055d2d60b847ba4b221edda5e119':
  Correct exception behavior for default methods