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

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