Merge "Improve debug logging of classes for 77342775."