Improvements to MapValueHasher and its test

Change-Id: I9b74c61ecc628891c3457821188dc0fd4afc504d
Merge "Improvements to MapValueHasher and its test"