Merge "Fix compilation errors when setting kTracing = true."