am: 069143f0 * commit '069143f0': Revert "Revert "Fix issue with proxy invocation on default methods""