Merge "Update package name for perfetto trace" into main