Merge "MemoryDealer: Avoid using invalid iterator"