Merge "More robust GC verification and corruption dumping"
am: 498305d881

Change-Id: I6b28aa4a3ece41c28cb8a6cd7b4e1e67c79bb117