Merge "CHA for interface method."
am: 747aeb4232

Change-Id: Idbf9e1ccab20dcffad2b9345b6558539a480cc90