Merge ""Revert^6 "CHA for interface method."""" am: 85f884104c am: 04a0b4c206
am: 3a81db33d7

Change-Id: Ia1c48ba8e2187a65d927c0b097919d2885fa1ea2