Merge "Rewrite some code using VersionedPackage#equals (1/n)"