Merge "memory_replay: Avoid use after erase()"