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