Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev