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

Change-Id: I7d786a70245d3662719620fffb468e53ee1fbc0b