Merge "Used the better hash method provided by Objects"
am: 262f84699e

Change-Id: I05df9cf2588ff7953419747fb3a5458ed7bcb6d3