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

Change-Id: I92b2320ac2d1fdb4fabe03af47688d87dac10eba