Merge "MemoryDealer: Avoid using invalid iterator" am: a1a91eae02 am: 5b71204ee8
am: 7806b628ba

Change-Id: Ib967cb121bcd0672fe2997709f8cb69866d9e399