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

Change-Id: Ief961afe9671dc9712e3eda0a7bbe397bdeb9f17