am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper key for removing object from the map."

* commit 'cd7dfcec4b9a059cd67783c8abed72f74c03c4b0':
  Using proper key for removing object from the map.