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

Change-Id: I579a5948c32a70fdb60286b19268a33c8ee7cc0c