Merge "Revert "Remove test for overloaded function."" am: 45ca9939a0
am: ac1287c8f6

Change-Id: Id5fdc194786a7cf5cd99133a7e397f296a686130