Merge "MemoryDealer: Avoid using invalid iterator"
am: a1a91eae02

Change-Id: I4e1f573c4ffbc6af3674f36833323a3de11ea1cc