Merge \\"Protect against crash in memory details\\" into nyc-dev am: c3ec1ab889
am: ca26435ca0

Change-Id: Ib5c782a3044161923c91aa8b5fb1fa31dedc9b09