Merge "memory_replay: Avoid use after erase()" am: f2f1bf377d am: 342f3cd776

Change-Id: Ib52500e829cbc28d2d533625133c63fe07dcee2d