Merge "Populate mPackages with system pkg even if installed is better" into pi-dev am: 28ea454824
am: 0e8a46e41c

Change-Id: Idf8b18ec60d4eed489ebb9e5a909cbb1d1564f89