Merge "tracing: Avoid sleep in atomic context"