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

Change-Id: I79d7bc756e7f973155bfe31d06fafd9260f66850