am c703df81: am ff66631f: Merge "Fix the HashMap performance regression."

* commit 'c703df8116e92a98f33f6baf4eb4c7bf78584fd1':
  Fix the HashMap performance regression.