Merge "Fix PackageManagerSettingsTest failures"