Merge "Add hash map, reduce excessive hashing" into lmp-mr1-dev