Merge "Dump heap reference adjacent memory for logging corruption"
am: 1c6016e20f

Change-Id: I0bfe3a958c307d5a0f06d91ee5d399c405323e30