am 7d33d0c3: am c17f92ce: Merge "Use removePackageLI instead of removing mPackages" into jb-dev

* commit '7d33d0c36c7e8c9de4139af383f7491823055bc7':
  Use removePackageLI instead of removing mPackages