Merge "Fix NPE in PackageParser"