Merge "Fix PackageParserTest#testPackageWithComponents."