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

* commit '201f8dd63730b32b673cf2ce06db2f3653eaee04':
  Correct exception behavior for default methods