Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am: cc798ea2e5 am: 92268a691f
am: 8909982e6f

Change-Id: I3438b832e39d85a4e8d598e8f611e5d8a3ef185b