Merge "Eliminate warnings from PackageParser"