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

Change-Id: I5318068a7583ea078025e1ddeceb0f8f04f4e968