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

Change-Id: If36b3350e0694ffae3086be9307295c4516828dd