Merge "Dump heap spaces for heap corruption"