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

Change-Id: Id012633a50dda525e9317d374c6eb146d3c66c03