Merge "Revert "Revert "CHA for interface method."""
am: 7f4e4281f8

Change-Id: Icfaed60c0c0fe9345ad7df3068a18a468abd722e