Merge "Correct exception behavior for default methods" am: d15cd44c90 am: 201f8dd637
am: a679e34aaa

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