Merge "Use removePackageLI instead of removing mPackages" into jb-dev