Merge "Revert "Revert^4 "CHA for interface method."""
am: da9f7eb3e7

Change-Id: Iab9eff9139aa264f7dbc36942ce71f83d2d36c07