Merge "Revert "Revert^4 "CHA for interface method.""" am: da9f7eb3e7 am: 1e04bc01eb
am: aeb6443a23

Change-Id: I540bc0bae0245640ff1085e13ecfd89b5c0675e6