Merge "Dump heap reference adjacent memory for logging corruption" into oc-dr1-dev