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

Change-Id: I843b74fae7c6c8b937236755793d6739600e7643