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

Change-Id: I1bfba282b275a036c90482fd44bfe382de49f851