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