Merge "Allow clients of mapMemory to recover." am: 079afdf499 am: 636495c14d am: 771654961d
am: 0d0bd78eea

Change-Id: I7f6cd0df7fd332713ed1f9d4d2e9a99c0e7acbd3