Merge "Further improve debug logging for 77342775"