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

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