Merge "Dump more debug info for b/33006388."