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

Change-Id: I7e094870343ccaef32dc9523227b31bd849edab9