Merge "Fix PackageManagerSettingsTests and add KeySet info." into mnc-dev