Merge "Remove test for overloaded function."
am: 51a703aea4

Change-Id: Ia0d05fa4441468306634a378215004558263e859