Merge "Revert "Revert "CHA for interface method."""