Merge "Start removing remaining pm code to package manager"