Merge "Added test for overloading." am: a3ba3c359c
am: 51eac9ecae

Change-Id: I4e57905a1d5d22759021db4412f44b635da6e494