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

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