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

Change-Id: Ifaa0f1bf4d2b3a084aa0b0579b0ae9405cd9735e