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

Change-Id: I71192fb6d1ac2490f266c9158fc0cfcaf2702dab