Merge "Dump original-package entries."