Merge "Fix and extend debugging output for bug 74410240."