Merge "Improve debug logging for bug 77342775." into pi-dev