Merge "Migrate remaining parsePackage V1 to V2"