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

Change-Id: I62a95003019974706d91b8cb51361c6a2fc927dc