Merge "Revert "CHA for interface method.""
am: 65a599a4af

Change-Id: I03924fb3f0a61fa4451e9140b86ef3629ec872f0