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

Change-Id: Ic535cc7b6d5224a94cc422d32acc9e2f65100544