Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev