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

Change-Id: Ib5ce4b39cd620fc9d5be7ae51baeff36e2ffdd9b