am: 5457b86f * commit '5457b86f': Revert "Revert "Fix issue with proxy invocation on default methods""