Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into...

Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am: 8f8372b0 am: 67e288b4 am: 477628dd am: 2972a59b  -s ours am: 4269fa2a  -s ours am: 492c5cf0  -s ours am: 35158d06  -s ours am: 9995ba32  -s ours am: 78cf80b5  -s ours
am: 99d02808  -s ours

Change-Id: I68ac0ad6d76b9a4cb52893a5062dcc109cee690a