Merge "Add extra logging for bug 74410240."