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

Change-Id: I8bc88b1c765b851d21d1ad718e66adf72d44dccd