Merge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev