Merge "Follow-up Id75401be (e32c8afe): no more need to prefix debug messages"