Merge "Fix broken PackageParserTest" into oc-dev