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

Change-Id: Ia644917c78de647a7e72a1389d32eaaf3e926582