Merge "Move PackageParser2 to internal" into main