Merge commit '983d4583e7bb1788d377296fe34babc1956c0a3c' * commit '983d4583e7bb1788d377296fe34babc1956c0a3c': Fix up PackageManager tests
Merge commit '983d4583e7bb1788d377296fe34babc1956c0a3c' * commit '983d4583e7bb1788d377296fe34babc1956c0a3c': Fix up PackageManager tests