Merge "Use custom proto instead of debug string for perfetto traces" into main