Merge "Clean up unused debug logs for b/319168409" into main