Merge "Set right attributes on tracing folder"