Merge "More robust GC verification and corruption dumping" am: 498305d8 am: 59f799b1 am: 338a6ecd am: da85c80f Change-Id: Id012633a50dda525e9317d374c6eb146d3c66c03