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

Change-Id: I4e179c3ff4fc6bea75cbe52cc4cdbc9949470b1c