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

Change-Id: If25a5d2495b699af03ff2e6180e8c47ebb87970b