Merge "use std::hash instead of hashing byte by byte" am: aaa0bbce8e am: bfb96796a4
am: 957dc094bf

Change-Id: I5fc4c1e7a51ba3b539b906141912a19851aedc9f