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

Change-Id: Ibfc9a9070802d5feb87138cbe42ec25326fb643a