Merge "Revert "Revert "CHA for interface method.""" am: 7f4e4281f8
am: adc1a23b39

Change-Id: Ied75311354b4b52995bf18ab5ef5cde13e7d3baf