Merge "Revert "Populate mPackages with system pkg even if installed is better""