Merge "Revert "Revert "Fix issue with proxy invocation on default methods"""