Merge "Revert "Fix issue with proxy invocation on default methods""
am: a67a089

* commit 'a67a089761ca770aa50122c47c5451a52e7eb807':
  Revert "Fix issue with proxy invocation on default methods"