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

Change-Id: I8757d3d8c29e0ad5a6c84999204db5f4791da177