Merge "Allow clients of mapMemory to recover." am: 079afdf499
am: 636495c14d

Change-Id: Ib2a4fac1e25bc8ecf16c54571bf62a34058b3d9e