Merge "Additional debug logging for bug 33231647."