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

Change-Id: I64ec49c820c21971056b342908a1e0c33d394d72