Revert "Revert^4 "CHA for interface method.""

Still failing on the bots.

This reverts commit fb185130f35bbfe2ba1875974ed39ef0b3c7a77f.

Change-Id: I1629e237dd41ce4784ccadbfc346352dfcbdb137
25 files changed