Merge "PackageParser: remove temporary code." into jb-mr1-dev