Merge "Fix: PackageInfo for apex has wrong info"