Merge ""Revert^6 "CHA for interface method.""""
am: 85f884104c

Change-Id: Ib415717a8e0a8c465908f0e20bdbc968dc0cd58c