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

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