Merge "Nit: PackageManagerService"