Merge "Revert "CHA for interface method.""