Merge "Fix NPE in PackageManagerService."