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

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