Merge "Dump more debug info for b/33006388."
am: ab1b1c06a7

Change-Id: I0022558d790e1f12b02dcf6d7a0fdd84e2d6612f