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

Change-Id: I5c55fc0ce83c34d89a1284a77628973bc984f8d0