Merge "Revert "Fix issue with proxy invocation on default methods"" into nyc-dev am: 09cd709
am: e7c5b21

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