Merge "Revert "Revert "Revert "CHA for interface method."""" am: bfe66b0184
am: ce5dbc118c

Change-Id: I02d4b81e8253bfa41daa49b42fd1d35b843d14b4