am ce0e3581: am abe07109: Merge "Add hash map, reduce excessive hashing"

* commit 'ce0e35811526993bb742539988020ea3c1d55daa':
  Add hash map, reduce excessive hashing